summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-02-09 04:15:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-09 04:15:12 +0000
commitaafc11b3d8564b078e98007bb27a3a41b4f535ee (patch)
treeacadc2afab9c34884515999235300bfcd4b57b63 /include
parent9026ea6d9891fdc9d6e39318b1f152671fc5502b (diff)
parent6d5a1afac2a7bca6b171261ca9b237c3a516e567 (diff)
downloadframeworks_av-aafc11b3d8564b078e98007bb27a3a41b4f535ee.zip
frameworks_av-aafc11b3d8564b078e98007bb27a3a41b4f535ee.tar.gz
frameworks_av-aafc11b3d8564b078e98007bb27a3a41b4f535ee.tar.bz2
am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev
* commit '6d5a1afac2a7bca6b171261ca9b237c3a516e567': stagefright: change licensing headers on h264dec omxdl sources
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions