OSDN Git Service

Merge remote-tracking branch 'aosp/android-7.1.2_r39' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 09:36:06 +0000 (17:36 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 16 Oct 2019 09:36:06 +0000 (17:36 +0800)
commitfaf7d2b80b72e5229c4a117f06360385f2c5c80e
treeb2725083d559a0cde9aba28176d9fe5cda30c119
parentb6f5b7794706a33b5374aa0de752667551e1c641
parentfdfa3a1696486527a3dbf891127ed73ebd520c11
Merge remote-tracking branch 'aosp/android-7.1.2_r39' into nougat-x86

Conflicts:
default.xml
default.xml