| commit | 7383df1fd3cde5f932ebd54a6776f5b5414edf9b | [log] [tgz] |
|---|---|---|
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | Fri Mar 13 11:44:32 2020 +0800 |
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | Fri Mar 13 11:44:32 2020 +0800 |
| tree | 076925e38b88ec6771a7f983b1ddb6c0b07ca2c9 | |
| parent | 1d57cfeb473a8df2546424f7cce607a1331bb56e [diff] | |
| parent | d68f8f8986dbd571185bae98a81f4038a179e384 [diff] |
Merge remote-tracking branch 'x86/oreo-x86' into pie-x86 Conflicts: Android.mk