| commit | 4d25411b3a93c0b07d6f0818d0defffcfa78d86f | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 06 13:55:59 2018 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Mon Aug 06 13:55:59 2018 -0700 |
| tree | 848f07e81b44e2baae829f969a2638f0ba0283e2 | |
| parent | 5340684e439ff318b58ac6cea328fcc5f1381d53 [diff] | |
| parent | f6e7613bd3196639edc9ec3cc6ca3e84a6960fcd [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge Followed the following steps: # In repo client cd external/selinux repo sync . repo start mymerge . git merge aosp/upstream-master --no-ff # resolve any conflicts repo upload . Test: compiles/boots no problems. Change-Id: I4cd9f73fbbb818ef7fa07ff8dd183f8a7e892345