OSDN Git Service

resolved conflicts for merge of 32912e0a to stage-aosp-master
[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