diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-11-06 06:41:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-06 06:41:42 +0000 |
| commit | dae90d760d0132f5d396bf4a7c00624e09f2edb0 (patch) | |
| tree | 75f2ae1f26b158c703ccf99092ac5f54cf8691fb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ade1d2a6183f7294cb8d404b8585b811d1246a9b (diff) | |
| parent | 5352582f8075ceb3600ae9112071153b826df4ab (diff) | |
[automerger skipped] Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473 am: d60841c6e4 am: 5352582f80 -s ours
am skip reason: Change-Id I3ab497f2133c9020131ca4392f34aedb8da99cc9 with SHA-1 3fcb538e6f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481
Change-Id: I4b95447ecb5b536a697a61662dc3d8345592da25
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions