OSDN Git Service

resolved conflicts for merge of 6abcec1d to master
[android-x86/frameworks-base.git] / native /
drwxr-xr-x   ..
drwxr-xr-x - android
-rwxr-xr-x 1889 copy-to-ndk.sh
drwxr-xr-x - graphics