OSDN Git Service

resolved conflicts for merge of a0be50e4 to master
[android-x86/frameworks-base.git] / core /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - jni
drwxr-xr-x - res
drwxr-xr-x - tests