| commit | c3e8eef8825cd02ab93d6429fc04d3935327b1cc | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Jan 07 11:18:21 2019 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Mon Jan 07 11:18:21 2019 -0800 |
| tree | bda351bb6dfe16ff02a712ea8ed2519d737eddf4 | |
| parent | 5dabba05d189c1670f80fa88924ab2db7c3596e8 [diff] | |
| parent | fbc7248ffa8bb7a71fdc7f47440b2b39ba63fa71 [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: android compiles and boots and no observed problems. Change-Id: I9fedadcaad26aa01425b71b9897f2dd0aa53468d