am bd4aea1e: Revert "STOPSHIP libcamera2: remove device metadata"
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 9 Oct 2012 20:35:55 +0000 (13:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 20:35:55 +0000 (13:35 -0700)
* commit 'bd4aea1e512f4b4bfa5e3fc7a2ce8f0fa74fd27d':
  Revert "STOPSHIP libcamera2: remove device metadata"


Trivial merge