| commit | 594eddf21facc3e84a4de912a0e2d45c880fd1ab | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Apr 07 00:11:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 00:11:18 2015 +0000 |
| tree | 12868d89982fe013e17c7f2544882704f486589d | |
| parent | 7d669b3551c20109f5544455ca1555499693e1e1 [diff] | |
| parent | 514c8ffc36b3e93d9ffa61328149ae47ef749a5b [diff] |
am 514c8ffc: (-s ours) am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source" * commit '514c8ffc36b3e93d9ffa61328149ae47ef749a5b': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source