OSDN Git Service

resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp
[android-x86/frameworks-base.git] / media /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - jni
drwxr-xr-x - lib
drwxr-xr-x - mca
drwxr-xr-x - native
drwxr-xr-x - packages
drwxr-xr-x - tests