OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r3' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 10 Dec 2015 08:37:02 +0000 (16:37 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 10 Dec 2015 08:37:02 +0000 (16:37 +0800)
commit2b7ffdabf6cc07f3f9cea7aa14b05d20d8d1347e
treed35fabf119b235a96418b67fc9d37588edbf66c9
parent29ae3d9680d580def499bd69d91d5ece226845f0
parent75192938b50b222b9e7315fcb936bea0a22c1a8a
Merge remote-tracking branch 'aosp/android-6.0.1_r3' into marshmallow-x86
default.xml