| commit | 72121a46768b0cd0d40632ff5639d0f6275f592a | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Sep 06 11:46:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 06 11:46:55 2012 -0700 |
| tree | c4d21d9e7b081c697e59cc103a37e62cfd8e82a7 | |
| parent | 47e11611ffaea29fb1234943283c5c6fe3607c73 [diff] | |
| parent | 87ae2ac8653b6272302510dbb8846286f9c4f43a [diff] |
am 87ae2ac8: am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and lock" into jb-mr1-dev * commit '87ae2ac8653b6272302510dbb8846286f9c4f43a': EmulatedFakeCamera2: Split AE/AWB mode and lock