| commit | f8bae5571931c32d0913f08d7a11af8ec814dc3d | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 16:48:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 16:48:11 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | 076a77bf0930ae740e41fed820e4296f484da9af [diff] | |
| parent | db4c4b400a12cdafd374eb56f165d4ab2cb25a70 [diff] |
am db4c4b40: am 39b31294: am fdfa9769: (-s ours) Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev * commit 'db4c4b400a12cdafd374eb56f165d4ab2cb25a70':