OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r43' into marshmallow-x86
-rw-r--r-- 58770 cm.xml
-rw-r--r-- 53430 default.xml