tree fbb27dd0b6075f9f9417cc3bb275f87898b8ef39
parent da152fccb0a73029bb777cb9cf3ad3295d8de565
parent 536830ac65f758e72195a3c42d2e5d6cb540f8c0
author Nikita Ioffe <ioffe@google.com> 1572264388 -0700
committer android-build-merger <android-build-merger@google.com> 1572264388 -0700

Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112
am: 536830ac65

Change-Id: I3f9ee004ffef19b5e0f83cbb50e98a2939d2202b