tree 0fe003ba0d24a69430cffa048f11766abc81bc61
parent d2f4439cec2353d314cbfd6a0c8a72f746782077
parent 163d86b476beae234f337b4b2af1ecd76cb5a5c3
author Daniel Xie <dxie@google.com> 1442954478 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442954478 +0000

am 163d86b4: 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 '163d86b476beae234f337b4b2af1ecd76cb5a5c3':