tree cae82eb62ed5e65b74eb1cc8870b5007d9864571
parent 6ebe73ebca4915fd66ccb4b96bbf8b0ea0904572
parent f97e633e6d7029136da92af9dfc42fc319bc0fc8
author Yin-Chia Yeh <yinchiayeh@google.com> 1414576435 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414576435 +0000

am f97e633e: am a71dc8f6: am b091fd20: CameraITS: fix two failing tests

* commit 'f97e633e6d7029136da92af9dfc42fc319bc0fc8':