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