tree dff7b797d7f851ba17d60721d1be7a8c2acaa820
parent 9e30a6e374c0ac154d6ea256f50597c4b0b63cca
parent e5dd62e873448fd8c1fd8e80739b58bda649a6e7
author Wu-cheng Li <wuchengli@google.com> 1276241706 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276241706 -0700

am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.

Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.