summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-07 00:01:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-07 00:01:17 +0000
commit514c8ffc36b3e93d9ffa61328149ae47ef749a5b (patch)
tree4c2cbb428c9d0fdafec7ce53aa52da292fee72ec /services
parent3248cb7dd030d9b45362c1c0364763419be9064c (diff)
parent0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b (diff)
downloadframeworks_av-514c8ffc36b3e93d9ffa61328149ae47ef749a5b.zip
frameworks_av-514c8ffc36b3e93d9ffa61328149ae47ef749a5b.tar.gz
frameworks_av-514c8ffc36b3e93d9ffa61328149ae47ef749a5b.tar.bz2
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
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions