tree 7f91c9fa6ba071d4891cb65ba325769746165288
parent 82cd5e5ca29b307967cf8e3cabd9a7c29d3a2242
parent 79d97606691599816b99b9fc661d47d79c15969e
author Daniel Xie <dxie@google.com> 1442336502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442336502 +0000

am 79d97606: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev

* commit '79d97606691599816b99b9fc661d47d79c15969e':
  CtsDeviceVideoPerf: limit bitrate to main or baseline profiles