OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r31' into marshmallow-x86
-rw-r--r-- 58306 cm.xml
-rw-r--r-- 53314 default.xml