tree 238c46a221023c405535b378626c671384d7405c
parent 10c0b0bcb9a95b20939a1dbc785e4e3346e715f4
parent 3f99b14939ec616ef59f62887e2532cd89409a3e
author Nick Kralevich <nnk@google.com> 1541428896 -0800
committer Nick Kralevich <nnk@google.com> 1541428896 -0800

Merge remote-tracking branch 'aosp/upstream-master' into mymerge

In particular, pulls in
https://github.com/SELinuxProject/selinux/commit/3f99b14939ec616ef59f62887e2532cd89409a3e
which is needed for b/118685852

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 .

Bug: 118685852
Test: Android compiles and no obvious problems.
Change-Id: Ic8f1bb2b573a1491b733732653afd7dbe494c85f