am 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metadata fixes...
authorAlex Ray <aray@google.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
* commit '9dc5f4f7212c37eac1801eb0d3d14f6524e22708':


Trivial merge