summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-15 23:37:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-15 23:37:20 +0000
commitce65a05eddc8a39d9805d1e1eee0292725df1f1c (patch)
tree90485f0b968412906326e1248a5da0d6e025a003 /include
parent1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (diff)
parentf5f24006f7bd997c6bca00804ec0f35bddd7ccc2 (diff)
downloadframeworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.zip
frameworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.tar.gz
frameworks_av-ce65a05eddc8a39d9805d1e1eee0292725df1f1c.tar.bz2
am f5f24006: am cd4eb72e: Merge "media: -Werror re-enabled"
* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2': media: -Werror re-enabled
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions