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


Trivial merge