am ba949fe2: am 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metad...
authorAlex Ray <aray@google.com>
Fri, 6 Dec 2013 22:19:16 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:16 +0000 (22:19 +0000)
commit7f0f0f69d2e3e908e80f05e6237bb48666f24cd6
treeeaff7d37ba3032d6462fa461c4a03f7828481db1
parentb7f855af151cbd1a5ef7d65d0146c46ad5afda54
parentba949fe2d7f7a216c7992be462136ba9f0da145e
am ba949fe2: am 9dc5f4f7: am 87710506: Merge "libcamera2: Static characteristic metadata fixes" into klp-dev

* commit 'ba949fe2d7f7a216c7992be462136ba9f0da145e':