diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:22:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:22:38 +0000 |
| commit | 21adb47574862624995b10a9aaf28125a0ffc6f2 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9331d35e52edb766604bbf6883ac1c4bdd6bf646 (diff) | |
| parent | b0cd3fe53e796a200d76c74e98b7812eb9dc27ca (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours am: 47c1d3f7a8 -s ours am: 89a0cae9f9 -s ours am: d8bbffa133 -s ours am: b0cd3fe53e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420421
Change-Id: I56719b5ebdf0983d73fd1f26687001733fafa1d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions