diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-22 22:30:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-22 22:30:56 +0000 |
| commit | 69446c2bdd1dc9ec4f03d9e094eeb6d7cea5fdbb (patch) | |
| tree | d759d27b3dd309ad77f7ffa3226b228d953ab275 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d1a4f92e5d866cba1599c424b90b333a222d01c (diff) | |
| parent | c2fc48632c29458711566fcfc409f5e6d43555c1 (diff) | |
[automerger skipped] Merge changes from topic "exif-webp" am: b2356e4d98 am: 00ce3a3594 am: 67ddcd19b2 am: 24da2739c0 am: c2fc48632c -s ours
am skip reason: Change-Id Ib6319e1b7b6711b071542d94ebfdc4a9f80e9c16 with SHA-1 2018d2bd3c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429
Change-Id: Id82f7d013710c5a8ab86a0cbef796ad039d28382
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions