| commit | ddc861135d0c16be592dc662d3827b232ec301bd | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 00:57:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 00:57:24 2015 +0000 |
| tree | b7f6a54d80cebbea3fa82617f65cdc3c3dd081da | |
| parent | 391a9b93b429b98dd34ffe3e66945b02a298285c [diff] | |
| parent | 86842fa7d797baf820f18e6daab6d95715c92f50 [diff] |
am 86842fa7: (-s ours) 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 '86842fa7d797baf820f18e6daab6d95715c92f50': cts: get video size from CamcorderProfile -- DO NOT MERGE