tree 4073b9c70d76a137f0a35db48e62fde401777aa8
parent af4586a27fffabb76bc754ce61a41d16fd0fea1e
parent e913a7aa106240158bbb0ce846b99995c5190889
author Daniel Xie <dxie@google.com> 1444955110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444955110 +0000

am e913a7aa: am 79b7ea9f: am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev

* commit 'e913a7aa106240158bbb0ce846b99995c5190889':
  Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080