tree be548812f2e429ca1de8acec56f6261e042e3a10
parent 9c2d0f2d5b0642b1f5d88c52fe4fe7d0a24d29d4
parent 203f6997c6e4538af66e02d1c76300f201b3e4d8
author Chong Zhang <chz@google.com> 1444154752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444154752 +0000

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

* commit '203f6997c6e4538af66e02d1c76300f201b3e4d8':
  cts: get video size from CamcorderProfile -- DO NOT MERGE