diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 09:03:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 09:03:25 +0000 |
| commit | dbcf9a74dc1b11e7978b336428329546c4b8cdd5 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b67a195c5a7ee253b6bf7964429a8585a7c6c02 (diff) | |
| parent | b4e0a2f9b47604eb599d65da28dbe552c3044f17 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5cadaf83db -s ours am: 1438e6df82 -s ours am: 6f6a5e1c85 -s ours am: 8dd48c609a -s ours am: b4e0a2f9b4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419988
Change-Id: Ie85ed15f144cc36b47d5c6746b4ca52c58f617e1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions