| commit | 781054cc2f2ac32f1f99bccb68b0d66aa8215ea0 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Mar 29 10:15:37 2019 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Mar 29 10:15:37 2019 -0700 |
| tree | fcaeeb6cbe3cd8dd27a9ba5ca4034583ea975a74 | |
| parent | ffb4432b9ae6fd1988f3c2c1a19ad9d606606697 [diff] | |
| parent | 42f73af5076411de3c6a5b2bed21a4fd6ae44acd [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: I75ccf5307012a2517c0fdf13bea806e10b8b8595