diff options
| author | Mark Chien <markchien@google.com> | 2020-10-12 10:47:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-12 10:47:49 +0000 |
| commit | 14f98ff8486a66f156d80ecb96126a2f00dd6be9 (patch) | |
| tree | a8905244a234ad8d07045b1cc7ac6c2872858912 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 186229a2274974c5f649bceef7fce001c5c7a871 (diff) | |
| parent | 4c4f42a7f50450d798a606dbce0cafdb2efc1e7d (diff) | |
[automerger skipped] Merge changes I60ed5465,I70b49d0a into mainline-prod am: 4c4f42a7f5 -s ours
am skip reason: Change-Id Iddc5304730dce7b11c5d124b7eddce057d752bbd with SHA-1 6626f7bcc9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12789075
Change-Id: Ia95b27c0ce749a9f7cab5cba532fde873bf44cb0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions