| commit | 0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Apr 06 23:50:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 23:50:38 2015 +0000 |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec | |
| parent | af69e81834d09a02a6bfe1b685e66cd007243373 [diff] | |
| parent | 39a8a37759b6964b29b721b83079642c38ec417e [diff] |
am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source" * commit '39a8a37759b6964b29b721b83079642c38ec417e': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source