| commit | 6f9b657ca0616c5af2f59b1fa21e9af098fdc5a2 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 23 00:37:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 23 00:37:13 2015 +0000 |
| tree | bf88f21db0bb95b7d04dcab17e40a685dd0cf672 | |
| parent | 9a99de67619ddfee7a6b05e1d390a42729f30f5d [diff] | |
| parent | 3b59ea0372de818cd633eaa0adf77a095d9eee4b [diff] |
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 '3b59ea0372de818cd633eaa0adf77a095d9eee4b': cts: get video size from CamcorderProfile -- DO NOT MERGE