tree 0be5a7c9b22b4e63f68655908c39920480f2aadc
parent 6c075acf4b642899e34058de3ce35156b9911f1c
parent 6e4ba20d0585eb016dd2bf77409cd06352caf18b
author Yin-Chia Yeh <yinchiayeh@google.com> 1429203447 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429203447 +0000

am 6e4ba20d: am 28c53c62: Merge "DO NOT MERGE: Camera: move YUV burst framerate check from ITS to CTS" into lmp-mr1-dev

* commit '6e4ba20d0585eb016dd2bf77409cd06352caf18b':
  DO NOT MERGE: Camera: move YUV burst framerate check from ITS to CTS