OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
[android-x86/frameworks-base.git] / tests / MemoryUsage /
drwxr-xr-x   ..
-rw-r--r-- 414 Android.mk
-rw-r--r-- 609 AndroidManifest.xml
drwxr-xr-x - src