diff options
author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-12 03:41:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 03:41:57 +0000 |
commit | 4cd3f32ec7bd93d0099c74b81d1e36f59a85be1f (patch) | |
tree | 8738eed67f07f927ff9b47dee45c59d904ced1f3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f93f144b441f6a8dd439c7d059d9bbad94264f0d (diff) | |
parent | 0bf2dfbefcde24b3d2b8aada66ce516696b37ba1 (diff) |
Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4 am: aab03fb10c am: 0bf2dfbefc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ba4a167eb17922ef49bf1c928032e8032dee30f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions