| commit | ff0d56fb0b8654740df4838139e041b512bf5b2d | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Oct 15 23:55:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 15 23:55:00 2015 +0000 |
| tree | 1ff0825ca3fce145163b3ae8c875024f9d1aa00a | |
| parent | a1694bdcf39715c457180a66a1311e849b6255f9 [diff] | |
| parent | 71c0d241722cc55f560443b0b139c655e9619d06 [diff] |
am 71c0d241: Merge "Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080" into lollipop-cts-dev * commit '71c0d241722cc55f560443b0b139c655e9619d06': Fix for android.media.cts.DecoderTest#testH264Decode60fps1920x1080