| commit | 34fb6b5bc86003252380f77026aa98a6098f40ec | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Jul 23 18:31:32 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jul 23 18:31:32 2015 +0000 |
| tree | 79cf99aed2add0703730546357d01254f9bba9c8 | |
| parent | 1f831156a2400283339235d85854a6027af92381 [diff] | |
| parent | 4c1cd59d3471fcdc81a510406f649c49f456bfb0 [diff] |
Merge "DO NOT MERGE: Camera: don't always require ZSL template" into lollipop-mr1-cts-dev