| commit | 58cc513174e0958a6ff2164d8f5c1221fd674497 | [log] [tgz] |
|---|---|---|
| author | electrikjesus <electrikjesus@gmail.com> | Tue Nov 22 09:58:17 2016 -0800 |
| committer | electrikjesus <electrikjesus@gmail.com> | Tue Nov 22 09:58:17 2016 -0800 |
| tree | 3761cc1ac7fcaed6e39cf75d24fcbfaa37276a8b | |
| parent | 9ec39fa8099269826da1729811abe5f69d42937e [diff] | |
| parent | 2340e8f66d437532cbb5694122a7ca8a746c498c [diff] |
Merge remote-tracking branch 'refs/remotes/android-x86/nougat-x86' Conflicts: core/binary.mk core/build_id.mk core/main.mk core/tasks/kernel.mk core/tasks/vendor_module_check.mk core/version_defaults.mk tools/releasetools/ota_from_target_files.py