commit | dfea6a1f6422390968760919095c57aa6ef05073 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Wed Sep 23 00:44:39 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 00:44:39 2015 +0000 |
tree | 8e65e1f4463e308258f535db70b03afb5e94742a | |
parent | e4b7a091c02e8f93b109c8f81c77c921c5e2e66e [diff] | |
parent | 6f9b657ca0616c5af2f59b1fa21e9af098fdc5a2 [diff] |
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 '6f9b657ca0616c5af2f59b1fa21e9af098fdc5a2': cts: get video size from CamcorderProfile -- DO NOT MERGE