diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 13:10:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:10:28 +0000 |
| commit | 6cbb81622164789f2eacad098c789787f3ec1286 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b8d140375c068ed3010e1abc9e607bccd15efbc3 (diff) | |
| parent | 027e5760b400cfa66f4a0ba46b52cacdee10e5fe (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0496eccd66 -s ours am: 027e5760b4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419720
Change-Id: I89cd1adabe7f3a6e8b5d62d46ce0e5fe480f77e8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions