tree 5eac4cfa3fc1c9535b1a239a95140158d1e089a7
parent 03416610b60cb102b9e819ac9aa70ff1292dc9a7
parent 1297653cb490a675ea6ce7f7e463fe189da4b113
author Yin-Chia Yeh <yinchiayeh@google.com> 1436994225 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436994225 +0000

am 1297653c: am 910fe63f: Merge "Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."" into kitkat-cts-dev automerge: 3323726 automerge: ef8b550

* commit '1297653cb490a675ea6ce7f7e463fe189da4b113':
  Revert "Update CTS Verifier camera video tests to check for a microphone in camera video recording tests."