diff options
author | Lajos Molnar <lajos@google.com> | 2014-06-24 19:42:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 19:42:44 +0000 |
commit | 18ecefebded5be766a000a8d8e8d578b7b846065 (patch) | |
tree | c1009748a8288b9b418b9597f0be853dd1f01c2a /services | |
parent | 840797f674f7c38d5215d0bcf0f4547c4e9a6957 (diff) | |
parent | 32f212ead657617df00c948448680b7ff7d11146 (diff) | |
download | frameworks_av-18ecefebded5be766a000a8d8e8d578b7b846065.zip frameworks_av-18ecefebded5be766a000a8d8e8d578b7b846065.tar.gz frameworks_av-18ecefebded5be766a000a8d8e8d578b7b846065.tar.bz2 |
am 32f212ea: (-s ours) am 87c47b0d: (-s ours) am bc0c2c2d: (-s ours) Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
* commit '32f212ead657617df00c948448680b7ff7d11146':
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions