diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-06 23:40:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 23:40:37 +0000 |
| commit | 39a8a37759b6964b29b721b83079642c38ec417e (patch) | |
| tree | ec0f96c66e44c39e83800bb7a02792ab57781e99 /services/camera | |
| parent | 4ea8ecf7bfa54ea6440f833cc9f9c475779860e4 (diff) | |
| parent | ddd1c72b7d4e407fed59a4f0f45408f1fe9a0cd8 (diff) | |
| download | frameworks_av-39a8a37759b6964b29b721b83079642c38ec417e.zip frameworks_av-39a8a37759b6964b29b721b83079642c38ec417e.tar.gz frameworks_av-39a8a37759b6964b29b721b83079642c38ec417e.tar.bz2 | |
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
Diffstat (limited to 'services/camera')
0 files changed, 0 insertions, 0 deletions