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