OSDN Git Service

resolved conflicts for merge of 783e115b to jb-mr1-dev
[android-x86/frameworks-base.git] / voip /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - jni