tree 891e0b1279be4675cd43a606f1509ece6c29d8da
parent fb2d29b0bac08d3aa31d53bfbeec73d62acac5a3
parent 28c53c620ac2042d3dd13c76203af937ed16e098
author Yin-Chia Yeh <yinchiayeh@google.com> 1429202761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429202761 +0000

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

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