OSDN Git Service

resolve merge conflicts of b3a0cc6 to stage-aosp-master am: 3fd32ebb0c
-rw-r--r-- 1422 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
drwxr-xr-x - uevent
drwxr-xr-x - wifi