tree 9c651489655d3ef52ed15f677c4a44b08a5886b6
parent 0f279346e37c0af13b1d8e452e9b589e8a59c30e
parent edcfe23aa13575f6a22d903636edd70f0c87cd58
author Yin-Chia Yeh <yinchiayeh@google.com> 1441099041 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441099041 +0000

am edcfe23a: Merge changes Ib687cb8d,Iaa97a529 into lmp-sprout-dev

* commit 'edcfe23aa13575f6a22d903636edd70f0c87cd58':
  CameraITS: adjust lockedBurst test settings
  CameraITS: Marking known failures for ITS