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