diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-30 20:18:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 20:18:59 +0000 |
commit | ce83bd78602c9801d4c5c63471e8d3e509ccb4e6 (patch) | |
tree | 9e56d983f074dfb118e8e7ebb21656655d22e99b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fc3dc6e083f2b06d6c41b08d25271d7373e56fd2 (diff) | |
parent | 263e7f5af134b7274818efea4fb4e497d87304e1 (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: 263e7f5af1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I1dfc5c3ca4833559ce1e69dacec1cca1dcf88f1a
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