OSDN Git Service

[automerger skipped] Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff7...
authorNikita Ioffe <ioffe@google.com>
Mon, 28 Oct 2019 12:12:48 +0000 (05:12 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 28 Oct 2019 12:12:48 +0000 (05:12 -0700)
am: 667dadb67a -s ours
am skip reason: change_id Ice20ffcba2a0994c599dbebace252138ffd827de with SHA1 5d85bf3127 is in history

Change-Id: I9fe03c2c1e58979b28f5d8a34a6659ce487fd91e


Trivial merge