| commit | fcfa4c95063b7afea462fc17cf5621bd0198090e | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Tue Aug 19 18:54:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 19 18:54:43 2014 +0000 |
| tree | 1d65dcb393a7c9b8e092914f0d7d69d39be7567f | |
| parent | d40c7bb5ed38827ed5d887987e7820e274ef7851 [diff] | |
| parent | 32052c01ffbe35c0f8f11c55c2e9f971263da6ff [diff] |
am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev * commit '5e27ea673ae91907f7b2316a6008db629356178c': camera2: (Legacy) Add control.sceneMode = DISABLED to templates