diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-06 23:50:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 23:50:38 +0000 |
| commit | 0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b (patch) | |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec /services/camera/libcameraservice/api1/client2/ZslProcessor.h | |
| parent | af69e81834d09a02a6bfe1b685e66cd007243373 (diff) | |
| parent | 39a8a37759b6964b29b721b83079642c38ec417e (diff) | |
| download | frameworks_av-0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b.zip frameworks_av-0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b.tar.gz frameworks_av-0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b.tar.bz2 | |
am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source"
* commit '39a8a37759b6964b29b721b83079642c38ec417e':
DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source
Diffstat (limited to 'services/camera/libcameraservice/api1/client2/ZslProcessor.h')
0 files changed, 0 insertions, 0 deletions