OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r22' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 8 Mar 2016 02:40:04 +0000 (10:40 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 8 Mar 2016 02:40:04 +0000 (10:40 +0800)
commit5e33b0385a5b64d49a24aafb5b4398bfa112bb90
tree1ffece560e0eba285546299df08ab35c429d1d42
parent699d926d527575f75753c20c1c598bf82b41596f
parenta0b15d0a707c50391e4a718934482471518ae1b7
Merge remote-tracking branch 'aosp/android-6.0.1_r22' into marshmallow-x86
default.xml