| commit | 18205ff9d71717029af075d82e0e25906901af97 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Feb 11 10:17:17 2020 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Feb 11 10:18:08 2020 -0800 |
| tree | 28ec24aa2f19ece275ceb3ca0e5c4ef28608b698 | |
| parent | 4a9e04bc056f23d3ba82deeb03b41e7547dbff33 [diff] | |
| parent | a60343cabfc22bdd08491103d8308fcd56df1a4d [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 lunch && make -j repo upload . Test: compiles and boots Change-Id: I45fd32fb9bfe2291ef32afcc86f26eb2b24e03e8