tree 6e07216839149041235733be2218067833baab58
parent 2ad2810910ebcfab057b253d7f2d635605d1baba
parent 8ab546e303813ad4f6c2fc94ca65959c77099a7e
author Daniel Xie <dxie@google.com> 1442871775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442871775 +0000

am 8ab546e3: am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35  -s ours

* commit '8ab546e303813ad4f6c2fc94ca65959c77099a7e':