| commit | 514c8ffc36b3e93d9ffa61328149ae47ef749a5b | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Apr 07 00:01:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 00:01:17 2015 +0000 |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec | |
| parent | 3248cb7dd030d9b45362c1c0364763419be9064c [diff] | |
| parent | 0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b [diff] |
am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source" * commit '0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source