tree 5430ad18d04cb520c804f02efe7ded7c8afde45a
parent c88bc262acc9cfa96682ac1a0a19de440b319ee9
parent 712db83beef61ab31b3feedb4d70922f0c354c7a
author TreeHugger Robot <treehugger-gerrit@google.com> 1596492089 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596492089 +0000

[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: 712db83bee -s ours

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

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

Change-Id: Ie5e23614fd1809306a89b60acfca1aa9809370e0