diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:29:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:29:32 +0000 |
| commit | 2ca918b7690582d95549b7b11ded674717efc754 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a43e00430212f01c2f5f6ba9d93fd4e204b4a979 (diff) | |
| parent | d5b49f996b3b2c4312a77bed5a0d6d0a831ad834 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 326a08ee7d -s ours am: d5b49f996b -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420156
Change-Id: I28f52b64c971ae9549b26e02f5528f45d62107c4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions