tree 4e9a85430e9194038960ae1ed4c7188cff146898
parent 923a98c77af2c6638b702ad8c24001ce6d3af379
parent cbd88b6c1ff748bd72422e22c3e9bffecd602e25
author Yin-Chia Yeh <yinchiayeh@google.com> 1433271288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433271288 +0000

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

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