tree 015bac9484fae7cc8b872a7d80317630b7921bb8
parent cc2fad6a205e822df28644ecb09a8fdb29151745
parent 58cfc43f54889d7a71827a2804ed49c9943bd811
author Yin-Chia Yeh <yinchiayeh@google.com> 1433269752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433269752 +0000

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

* commit '58cfc43f54889d7a71827a2804ed49c9943bd811':
  Camera: change supported preview/video size logic