OSDN Git Service

Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
-rw-r--r-- 1340 Android.mk
-rw-r--r-- 2428 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - audio
drwxr-xr-x - include
drwxr-xr-x - power
-rw-r--r-- 3458 qemu.h
drwxr-xr-x - qemu
drwxr-xr-x - qemu_tracing
drwxr-xr-x - uevent
drwxr-xr-x - wifi