tree 635017cb666e99a42256a2812a78971cdd9344c9
parent 1fd1f27bb33383b65032d2dd0d64a41216a9b560
parent 393bafd3c5a9209bb18fb5d8843a434fc714966b
author Nick Kralevich <nnk@google.com> 1507565501 -0700
committer Nick Kralevich <nnk@google.com> 1507565501 -0700

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: I4e7ee3fddfe021d128ebd70a663374367914b825