summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-30 20:38:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-30 20:38:35 +0000
commit4c709fd8eb571954987b14ecd7ca094ff670f602 (patch)
tree030e2cf5f6c2ae73cac39cd18c90c3b1eacc1559 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent2e14ed37e1f3f8655c83a7fa1844e9f82dfbe042 (diff)
parenta11a36187cbb78847b4e04f03feb9bfab262fede (diff)
[automerger skipped] Merge "Reset SurfaceControl when reapplying magnification spec" am: 8afb2bf120 am: 7f70fe2963 am: a11a36187c -s ours
am skip reason: Change-Id Ia04cb6c49b67dab98cee5bb0cacef12a8bdaffd8 with SHA-1 a8b3a273be is in history Change-Id: I1f68e9f50401816f990edd5d2233f1c2d1324ff0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions