tree 4db025c3c68b11b9ab66b9ab7350abee45b2cd85
parent 05d50e377e60e787219bd12d24b53aade6868859
parent 8dc18fe65d3f6327e4fd39eff10d995171842ec5
author Daniel Xie <dxie@google.com> 1445640864 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1445640864 +0000

Merge "Camera: allow FULLHD_ALT in jpeg sizes" into marshmallow-cts-dev