| commit | c2ab9326c861bf9529262cd133ee09ca6ccd7fe1 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jul 24 23:44:51 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 24 23:44:51 2015 +0000 |
| tree | 0ef53cd250d78fa0932074e3206e26cea5e2a4d2 | |
| parent | dd6dc04a6ae1a9bfe47debc522a4317673a1a661 [diff] | |
| parent | fdfa9769cc007480136e95483675483b61c305db [diff] |
Merge "DO NOT MERGE: Camera: don\'t always require ZSL template" into lollipop-cts-dev automerge: fdfa976 * commit 'fdfa9769cc007480136e95483675483b61c305db': DO NOT MERGE: Camera: don't always require ZSL template