Chih-Hung Hsieh 85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp ...

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

2016-04-28 12:08:15 -07:00

..

effect/java/android/media/effect

…

filterfw

Fix google-explicit-constructor warnings.

2016-04-27 11:38:12 -07:00

filterpacks

…

samples

…

tests

…

Android.mk

…

structgen.py

…