| commit | 51de99c7abb4be1a9ceb0f0e3f7f9b5f1c4a9bf3 | [log] [tgz] |
|---|---|---|
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | Wed Jun 13 16:29:54 2018 +0800 |
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | Wed Jun 13 16:29:54 2018 +0800 |
| tree | 9aedcd15b7ad736af73e558ad615ff3008bce222 | |
| parent | 27dee7b0a991c3c40bd3f16c886da24685e4fe45 [diff] | |
| parent | 46058ab5a6d334df4e9b67d80498047151b7ec07 [diff] |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86 Conflicts: install/grub2/efi/boot/android.cfg