tree b9a4d2e66fad08cf47837ac8384928249fe864e1
parent becc266c8209516d1f1dbb59b70493ea24ae26ac
parent 112de5b4bae986019b53283eda07802df47afedc
author Chong Zhang <chz@google.com> 1443043926 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443043926 +0000

am 112de5b4: (-s ours) am 78b871c1: am b34cb0d2: am 1b7f247c: am cd475df9: am 594963dd: (-s ours) am d61c8d39: am 4f378d75: cts: get video size from CamcorderProfile -- DO NOT MERGE

* commit '112de5b4bae986019b53283eda07802df47afedc':
  cts: get video size from CamcorderProfile -- DO NOT MERGE