tree 8e8b6c418c465031d545885a27e1db01807e9397
parent e4177f5cb49ef683313f9ab3daadc5fffe5e827a
parent a456c66de5aaea40d3827ca78c29aa15e8dcc28e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596493912 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596493912 +0000

Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours" into rvc-dev-plus-aosp am: ddb1194d7d -s ours am: 44a0c1854d -s ours am: a456c66de5 -s ours

am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 8f3de48e19 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12171287

Change-Id: Ib2db04fed35582053db7aaadae80850d4d76b1c6