OSDN Git Service

resolved conflics for merge of 54201120 to jb-mr2-dev
[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