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