summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-02-07 03:03:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-07 03:03:05 +0000
commit6d5a1afac2a7bca6b171261ca9b237c3a516e567 (patch)
treefc0459609f2699beb7e3bae2ab798e1d3cbe086e /include
parent5421d5b23d2fcea6ba5573bf3490c65f97c2e730 (diff)
parent6d5a063de358312e6d133f8937ffb1b795116129 (diff)
downloadframeworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.zip
frameworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.tar.gz
frameworks_av-6d5a1afac2a7bca6b171261ca9b237c3a516e567.tar.bz2
am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev
* commit '6d5a063de358312e6d133f8937ffb1b795116129': stagefright: change licensing headers on h264dec omxdl sources
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions