summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-03-30 20:52:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-30 20:52:36 +0000
commitb9573bc0958c1827ee5bfa5085f47eb0d1df4478 (patch)
treeb0b6fa5896e796b18167227094bebe519323e009 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent03b2b4d18004d8ddd77d17d13866eb1999c4b0ad (diff)
parent2f5a38fcab0a8dfd8b76e82eb8e22f8c1bb06800 (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: ce83bd7860 -s ours am: 2f5a38fcab -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663 Change-Id: I7c745490d1c259c67244b740fc5941d08bf2faca 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