summaryrefslogtreecommitdiffstats
path: root/media/libeffects
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-12 01:01:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-12 01:01:25 +0000
commit7b2b26750fb0a567f2d1b7a3547ae877d336e405 (patch)
tree3a17783e9f464311eb3167cd33e62666ab9d4963 /media/libeffects
parent3e08ca6709b5a75dc3b779cf3eba8196b08a0245 (diff)
parent67c93ad704d4418445c6d9693420f1cbaad98b0a (diff)
downloadframeworks_av-7b2b26750fb0a567f2d1b7a3547ae877d336e405.zip
frameworks_av-7b2b26750fb0a567f2d1b7a3547ae877d336e405.tar.gz
frameworks_av-7b2b26750fb0a567f2d1b7a3547ae877d336e405.tar.bz2
am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instantiated."
* commit '67c93ad704d4418445c6d9693420f1cbaad98b0a': Trigger error only when a template is instantiated.
Diffstat (limited to 'media/libeffects')
0 files changed, 0 insertions, 0 deletions