You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Jiyong Park bd5609f0a3
DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
7 years ago
..
Android.mk DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64 7 years ago
EffectVisualizer.cpp resolve merge conflicts of 4532a36 to master 8 years ago
MODULE_LICENSE_APACHE2 Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/ 12 years ago
NOTICE Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/ 12 years ago