tree 6dad61a8948153ccfb2718b48cbb1d70262f4d2d
parent f066e32f90b32fd14478a06e1b115440faf072d6
parent 925e922bd55f83912da91a7afc971302487ff1d5
author Daniel Xie <dxie@google.com> 1442347612 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442347612 +0000

am 925e922b: am 7cbe5bbd: am 0c243448: am 86a008ea: am 556e8377: am 513cd81a: am b5b05ae2: Merge "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests." into kitkat-cts-dev

* commit '925e922bd55f83912da91a7afc971302487ff1d5':