summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx/OMXNodeInstance.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-20 01:00:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-20 01:00:22 +0000
commit35cdb5c89ff8b3318f54338520982475bbf704f4 (patch)
tree05f56e70007b9fdd0df14a7f72e69c755ea33df8 /media/libstagefright/omx/OMXNodeInstance.cpp
parentc391d8871eb63afa0c505b54ddcc6910ef2f8844 (diff)
parentaf321dc195b74d3c3201ec72eb44df1bc7ca433e (diff)
downloadframeworks_av-35cdb5c89ff8b3318f54338520982475bbf704f4.zip
frameworks_av-35cdb5c89ff8b3318f54338520982475bbf704f4.tar.gz
frameworks_av-35cdb5c89ff8b3318f54338520982475bbf704f4.tar.bz2
am af321dc1: (-s ours) am 3b3cbeb3: am 2701ab04: am f077abb0: am 4022477b: am 8cfd0ac4: (-s ours) am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit 'af321dc195b74d3c3201ec72eb44df1bc7ca433e': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Diffstat (limited to 'media/libstagefright/omx/OMXNodeInstance.cpp')
0 files changed, 0 insertions, 0 deletions