| commit | 3e3e2412e74d0ce9d710303c85ca04cabf5e31df | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 22 21:20:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 22 21:20:00 2015 +0000 |
| tree | debb7555a80be8657ee4142a6c4dfa3531645f2b | |
| parent | e6f7d99dfc52518d5ec9b53f312c0fd62246de6c [diff] | |
| parent | 781f5e25bb35c6d842accd6c00c021fe26eaef2a [diff] |
am 781f5e25: (-s ours) am 8a54905c: am e25479fa: am a68b6c54: am 4da5b453: am 0e64deba: Merge "CtsDeviceVideoPerf: limit bitrate to main or baseline profiles" into lollipop-cts-dev automerge: 79d9760 * commit '781f5e25bb35c6d842accd6c00c021fe26eaef2a': CtsDeviceVideoPerf: limit bitrate to main or baseline profiles