OSDN Git Service

Merge remote-tracking branch 'aosp/android-6.0.1_r43' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 May 2016 19:33:04 +0000 (03:33 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 May 2016 19:33:04 +0000 (03:33 +0800)
commit26a000e7bc87b3f428cbb57a53e22f154a5fe573
tree129c64acc915a39bf25ef039eb89a3203234ea8f
parent52bb844e7561c82d64c2ae05653d3c4e3bf71592
parent4eac1d47b7b15fc2538792e5159d02178d92f303
Merge remote-tracking branch 'aosp/android-6.0.1_r43' into marshmallow-x86
default.xml