am 86dc75dc: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:43:05 +0000 (10:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 17:43:05 +0000 (10:43 -0700)
commit62a631ed3c68fa4e35e0a5b7769847baaff4db23
treed2f2e6e3a7da5cacdcbe272b685e654240c50574
parent03d071dab4a5e7850684452bc26635c626cc2316
parent86dc75dcb45880832dc125d2f38dce4ca63a1e78
am 86dc75dc: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '86dc75dcb45880832dc125d2f38dce4ca63a1e78':
  libcamera2: add hardwareLevel to camera metadata