| commit | 79b7ea9f573157a880ac87bd85c92d4cd40d9234 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Oct 16 00:13:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 00:13:34 2015 +0000 |
| tree | 5f5f433c75110465d7653d4f3732678d0521726d | |
| parent | 900695d50c361a6a5e9b1bf98c19430786392e51 [diff] | |
| parent | cef64655f0912c11b3c917ccbe7bc6252bab6979 [diff] |
am cef64655: am 18a2e918: am ff0d56fb: am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev * commit 'cef64655f0912c11b3c917ccbe7bc6252bab6979': Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080