OSDN Git Service

resolved conflicts for merge of 5e610d6a to master
[android-x86/hardware-libhardware.git] / include /
drwxr-xr-x   ..
drwxr-xr-x - hardware