OSDN Git Service

resolve merge conflicts of b3a0cc6 to stage-aosp-master am: 3fd32ebb0c
[android-x86/hardware-libhardware_legacy.git] / include /
drwxr-xr-x   ..
drwxr-xr-x - hardware_legacy