| commit | d5c87339cb96360401eed84428dfc5c5a50b9f73 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Oct 16 00:25:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 00:25:10 2015 +0000 |
| tree | 4073b9c70d76a137f0a35db48e62fde401777aa8 | |
| parent | af4586a27fffabb76bc754ce61a41d16fd0fea1e [diff] | |
| parent | e913a7aa106240158bbb0ce846b99995c5190889 [diff] |
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