tree 4f6d8c87f32fb08249734135df5a6957f14a852e
parent b757eb50b9030192b326865678f2df6f2519af67
parent 066ff634e07cd87d5c2bbb18a7d10e5eff10ec97
author Daniel Xie <dxie@google.com> 1445641909 +0000
committer android-build-merger <android-build-merger@google.com> 1445641909 +0000

Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev am: 1f8716504d
am: 066ff634e0

* commit '066ff634e07cd87d5c2bbb18a7d10e5eff10ec97':
  Camera: allow FULLHD_ALT in jpeg sizes