tree 1d2eb0c9c7d5931b7ab710ce6db0f067db3dd41c
parent adaa1e0df5b6226c8f44c75c015ab656cfe7a45d
parent 5b672fcd769c92b65f5f121fbf101cf6af657ab9
author Yin-Chia Yeh <yinchiayeh@google.com> 1433269117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433269117 +0000

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

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