am 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metadata fixes...
authorAlex Ray <aray@google.com>
Fri, 4 Oct 2013 18:09:39 +0000 (11:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 18:09:39 +0000 (11:09 -0700)
* commit '9dc5f4f7212c37eac1801eb0d3d14f6524e22708':
  libcamera2: Static characteristic metadata fixes


Trivial merge