tree 15b51228f06ce9c6601a054703807adf26daa343
parent 0c263a7ca25e39c9b54ff74fae4d6c37ebb7aea5
parent e7a3136b902cb899dac35ca32a49cb5bcac7e75e
author Daniel Xie <dxie@google.com> 1449798816 -0800
committer android-build-merger <android-build-merger@google.com> 1449798816 -0800

Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev am: 885182dd19  -s ours am: 803eae5fa6  -s ours am: 157726d10f  -s ours am: 6c6882b3b7  -s ours am: 0d18798422 am: 4a9a3fd676 am: 423b1a77b9 am: b0538a4994
am: e7a3136b90

* commit 'e7a3136b902cb899dac35ca32a49cb5bcac7e75e':