| commit | 86842fa7d797baf820f18e6daab6d95715c92f50 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 00:51:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 00:51:59 2015 +0000 |
| tree | 14c050c874608887bfd5398228ea9deea08a9de5 | |
| parent | 7ea0e3de485c042954c7775effe3a3e0f5c22678 [diff] | |
| parent | dfea6a1f6422390968760919095c57aa6ef05073 [diff] |
am dfea6a1f: am 6f9b657c: am 3b59ea03: am dd429123: 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 'dfea6a1f6422390968760919095c57aa6ef05073': cts: get video size from CamcorderProfile -- DO NOT MERGE