OSDN Git Service

resolve merge conflicts of 490d397d284f to oc-dr1-dev
[android-x86/frameworks-base.git] / location /
drwxr-xr-x   ..
-rw-r--r-- 682 Android.mk
drwxr-xr-x - java
drwxr-xr-x - lib
drwxr-xr-x - tests