am 87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev
authorAlex Ray <aray@google.com>
Thu, 3 Oct 2013 23:02:10 +0000 (16:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 23:02:10 +0000 (16:02 -0700)
* commit '877105063c2a4f9050ea899fcff3843f39050ec6':
  libcamera2: Static characteristic metadata fixes


Trivial merge