tree 9399b1befb441e303e82eac6e7c4fddf35aa1e76
parent 8b3f4ba3b59fcbcfac519719a8700685091c037c
parent 6a44e14561ad0afe08b17ca053236b67b8daa69a
author Yin-Chia Yeh <yinchiayeh@google.com> 1433181442 +0000
committer android-build-merger <android-build-merger@google.com> 1433181442 +0000

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

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