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


Trivial merge