commit | 9859206d1a9b89fd0dfab70e0a55d4b375c29a39 | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Wed Sep 23 21:32:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 21:32:06 2015 +0000 |
tree | b9a4d2e66fad08cf47837ac8384928249fe864e1 | |
parent | becc266c8209516d1f1dbb59b70493ea24ae26ac [diff] | |
parent | 112de5b4bae986019b53283eda07802df47afedc [diff] |
am 112de5b4: (-s ours) am 78b871c1: am b34cb0d2: am 1b7f247c: am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE * commit '112de5b4bae986019b53283eda07802df47afedc': cts: get video size from CamcorderProfile -- DO NOT MERGE