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