tree 015bac9484fae7cc8b872a7d80317630b7921bb8
parent c03cc877846c5676eaaaf7b24a3b3aefec5f6b48
parent 97698b18ddc8027174f5fb16ea595539aaf530e2
author Yin-Chia Yeh <yinchiayeh@google.com> 1433270703 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433270703 +0000

am 97698b18: am 58cfc43f: am 5b672fcd: am a1976879: Merge "Camera: change supported preview/video size logic" into lollipop-cts-dev automerge: 6a44e14

* commit '97698b18ddc8027174f5fb16ea595539aaf530e2':
  Camera: change supported preview/video size logic