OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r74' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Jan 2017 04:02:18 +0000 (12:02 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 10 Jan 2017 04:02:18 +0000 (12:02 +0800)
commit12a279bef1db4d578d348d4b996ac0002f1dd9d1
tree3a5308d448c39d89ec15b122056395ddb8dd4178
parentbb225775adae6963b6a30d170a1a4e54abdc7b1f
parent92a53556ebe0c9bf65cb7031c8f450767f59bb80
Merge remote-tracking branch 'aosp/android-6.0.1_r74' into marshmallow-x86
default.xml