tree b6cd5b176f420c22d28bfe9a397e188027b48afe
parent 5f1b8cd242027e40e3ee72acc123e2ddcd736a80
parent 2a1c286416beecc114e790c7ce547405edb130c5
author Chong Zhang <chz@google.com> 1444162291 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444162291 +0000

am 2a1c2864: am 40c7873c: am 203f6997: (-s ours) cts: get video size from CamcorderProfile -- DO NOT MERGE

* commit '2a1c286416beecc114e790c7ce547405edb130c5':
  cts: get video size from CamcorderProfile -- DO NOT MERGE