diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-30 19:55:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 19:55:26 +0000 |
commit | 263e7f5af134b7274818efea4fb4e497d87304e1 (patch) | |
tree | a7bce4d216c84e535b73fd5374f9137969c36be9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 42ce04bda8a2e86e34f6aac3720a2197890006a0 (diff) | |
parent | 49903f64b5eb7cea5957983eb71990ca7aa7095e (diff) |
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: If7590cdc14f8e54fab61a60ae2554af8d1203d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions