tree d3c6d2f67ca3a1c7b5ea5aab1fe880e113853fbd
parent 6e281b7dd674418caa122ff2f292c12f477f875e
parent d11fa270eb3964f042d0b4138eeb6c2559118146
author TreeHugger Robot <treehugger-gerrit@google.com> 1598673043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598673043 +0000

[automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 am: ef301aba3e -s ours am: 09b011ffca -s ours am: 53db65ef90 -s ours am: e8e4ec86a0 -s ours am: f7624ad857 -s ours am: 15fc4e152a -s ours am: 3597e69108 -s ours am: 51517501c9 -s ours am: d11fa270eb -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/+/12099340

Change-Id: I4900587244c1023a2659d8a22b11f8cf54917cfa