diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-29 17:26:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-29 17:26:53 +0000 |
| commit | 5d0937c663a9c3a20ca981bedf0b75e7d110eb34 (patch) | |
| tree | 59debb846921e75b255c2a2dd727999f9b5f0d2c /media/ndk | |
| parent | 17f32a27930cec82d0eff4d5fe7932bd72c869bb (diff) | |
| parent | 8564e13b37d372da78bce08f34a3610795ae173c (diff) | |
| download | frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.zip frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.gz frameworks_av-5d0937c663a9c3a20ca981bedf0b75e7d110eb34.tar.bz2 | |
am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aosp
* commit '8564e13b37d372da78bce08f34a3610795ae173c':
HLS: QCom enhancements
Diffstat (limited to 'media/ndk')
0 files changed, 0 insertions, 0 deletions