| commit | ddb1f6ffd2a722ec1f6f7df555e643b32ef061c9 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:21:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:21:47 2015 +0000 |
| tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
| parent | a4fd046626512aadb2df7c12993a3a91c0160d4b [diff] | |
| parent | 385aff2786b7b0bc82353cde597e8c1e09a20167 [diff] |
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 '385aff2786b7b0bc82353cde597e8c1e09a20167':