diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 21:41:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-24 21:41:58 +0000 |
| commit | 393d0215b90e910e09185bc193e8a857e84c2108 (patch) | |
| tree | 75a8c6ab0e8720ec5c5c52aea38c97a3339955d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dd55f1b568cc31eb585db971e3460c65bb65a13d (diff) | |
| parent | a21e075198d7d960e7d2ddf670aa27c1c86c1d8b (diff) | |
Merge changes from topic "am-8a097a00a97a4a42bb719679fed38ec2"
* changes:
[automerger skipped] Merge "Update to use nativehelper/JNIPlatformHelp.h" into rvc-dev-plus-aosp am: 3e10c5111d am: a0be056b53 am: 3fb01067dc -s ours
[automerger skipped] Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 4736a94d26 am: b14c4625d3 am: 5730c72110 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions