Merge "STOPSHIP libcamera2: remove device metadata" into jb-mr1-dev
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 18 Sep 2012 18:37:30 +0000 (11:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Sep 2012 18:37:31 +0000 (11:37 -0700)

Trivial merge