| commit | 6b2ccdc26b6866ef36bd3fd9c7d311200dbcb755 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Apr 30 18:39:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 30 18:39:38 2015 +0000 |
| tree | 11b30d06ae70ec2a12e3c98fda8642371c83cc8c | |
| parent | cae8686c8853de745baf8a26406d18efab09a380 [diff] | |
| parent | 6dee203aee673eea91633d8557a4aa1ff21296cb [diff] |
am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev * commit '6dee203aee673eea91633d8557a4aa1ff21296cb': Camera2: LEGACY: Support prepare(), sort of.