tree d3c6d2f67ca3a1c7b5ea5aab1fe880e113853fbd
parent c1c8efa7c817b8f179026d74b65101ed509cf2dd
parent 9c0d5a6e93c1b27fdc53ab69f53c80324f54f9e0
author TreeHugger Robot <treehugger-gerrit@google.com> 1598673026 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598673026 +0000

[automerger skipped] Merge "Add missing isShellUser check" into oc-mr1-dev am: 0fb5377eb5 am: f1a3a1e736 -s ours am: 2f744694aa -s ours am: eb77f566d1 -s ours am: b18d53a327 -s ours am: f6189f54f3 -s ours am: dd4fb81666 -s ours am: 9c0d5a6e93 -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/+/12172257

Change-Id: Ia307867f46581a59d00580127b6b65cf368080b2