| commit | 163d86b476beae234f337b4b2af1ecd76cb5a5c3 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:31:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:31:59 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | 67dce4537b79ac47bdda4b297099ce4dc9f01320 [diff] | |
| parent | ddb1f6ffd2a722ec1f6f7df555e643b32ef061c9 [diff] |
am ddb1f6ff: am 385aff27: (-s ours) am 16845326: am f8bae557: am db4c4b40: am 39b31294: am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev * commit 'ddb1f6ffd2a722ec1f6f7df555e643b32ef061c9':