summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorDiksha Gohlyan <dikshag@google.com>2020-06-03 19:35:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 19:35:28 +0000
commitcd6188f055ecaf128598ea3fd13cd63707badd39 (patch)
treec40894633e6a0ca597bbee4bbc81387e3eace6c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent15e4b0b5c2cb87e3ac19f37beb38457d00198724 (diff)
parent77c9dd1ebf97fb5a7c258ca373cc59ff815813d6 (diff)
[automerger skipped] Merge "Add back enforceReadPermission for getmetadata" into pi-dev am: 63369efdc7 -s ours am: a2165815e3 -s ours am: 0dfd3dd08e -s ours am: e3eaf4a710 -s ours am: 422df4c485 -s ours am: 03b6a23779 -s ours am: 77c9dd1ebf -s ours
am skip reason: Change-Id I4f04f08f76d039196c2c67bac80d4a46ebec87f2 with SHA-1 c94646177c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11402658 Change-Id: Iae4c29f57a1c7ff9236863226478c427b2ad40db
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions