| commit | dd429123474ee9f46932e87d74cbd51ededf990c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 00:18:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 00:18:51 2015 +0000 |
| tree | 9faeff1ee19c4928bac225b48ba4c440787bef4d | |
| parent | eaba159bcc432361b1d000b7fd384d0bddcbc0f9 [diff] | |
| parent | 7378587e3d3218baf5b3ffed167df86300562859 [diff] |
am 7378587e: (-s ours) am a6387714: am e039c05f: am 885182dd: (-s ours) Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into kitkat-cts-dev * commit '7378587e3d3218baf5b3ffed167df86300562859': cts: get video size from CamcorderProfile -- DO NOT MERGE