OSDN Git Service

resolved conflicts for merge of b9d21d62 to master
[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