| commit | becc266c8209516d1f1dbb59b70493ea24ae26ac | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 21:32:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 21:32:04 2015 +0000 |
| tree | b9a4d2e66fad08cf47837ac8384928249fe864e1 | |
| parent | 23d0da82b0a6ccbd38f697922eb21c59334465eb [diff] | |
| parent | 9d76ccdafc9f01eed559c059eb2e487329275084 [diff] |
am 9d76ccda: (-s ours) am 5aa0fbf7: am 08c80922: am e38dfdc1: am d21bfade: Merge "cts: get video size from CamcorderProfile -- DO NOT MERGE" into lmp-dev * commit '9d76ccdafc9f01eed559c059eb2e487329275084': cts: get video size from CamcorderProfile -- DO NOT MERGE