OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r10' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Jan 2016 12:17:01 +0000 (20:17 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Jan 2016 12:17:01 +0000 (20:17 +0800)
commit69a9e2aff346be223434f6e5fbe4eef498d365eb
tree40e6972cf48e829f1b6f7d4e2dc678dbd57c23ea
parent2b7ffdabf6cc07f3f9cea7aa14b05d20d8d1347e
parent1150c4dc0b6716ea5db4e07c5b4df0921b12bf69
Merge remote-tracking branch 'aosp/android-6.0.1_r10' into marshmallow-x86
default.xml