OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
[android-x86/frameworks-base.git] / tests / UsesFeature2Test /
drwxr-xr-x   ..
-rw-r--r-- 798 Android.mk
-rw-r--r-- 1687 AndroidManifest.xml
drwxr-xr-x - res