OSDN Git Service

resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. am: 5a77651489 am: 5946a9b798
[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