OSDN Git Service

Merge remote-tracking branch 'x86/oreo-x86' into pie-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 22 Nov 2019 09:54:58 +0000 (17:54 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 22 Nov 2019 09:54:58 +0000 (17:54 +0800)
commit11101b9a7affe4904b7efebffdb79210a2ef3eaa
treeaae95c81ffdbc84e3f5bcbbcbfcae7c3bbeabe5c
parent885a4ead6e750592d6b187b2ab872f23d9234306
parent85510fcf44e0edc0aee4f8beeea7f2e5923049c4
Merge remote-tracking branch 'x86/oreo-x86' into pie-x86

Conflicts:
Android.mk
Android.mk