| commit | 7775348300b677adb45afeae5f72c18aa6b09585 | [log] [tgz] |
|---|---|---|
| author | electrikjesus <electrikjesus@gmail.com> | Tue Nov 22 06:46:20 2016 -0800 |
| committer | electrikjesus <electrikjesus@gmail.com> | Tue Nov 22 06:46:20 2016 -0800 |
| tree | e43f9392ebf987658f69e455bac08dd1bfd6c7e8 | |
| parent | 6f9d1a27b94566db45a89e6af264762e2f346ca2 [diff] | |
| parent | 2340e8f66d437532cbb5694122a7ca8a746c498c [diff] |
Merge remote-tracking branch 'refs/remotes/android-x86/nougat-x86' Conflicts: CleanSpec.mk core/binary.mk core/build_id.mk core/main.mk core/tasks/vendor_module_check.mk core/version_defaults.mk tools/releasetools/ota_from_target_files.py