diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 06:57:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 06:57:07 +0000 |
| commit | 3fe9ef5c4ece56aa8cade6132b2360db02f2917d (patch) | |
| tree | 26da2b660044f205549652cbf2aa2abf47f06e3d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b27b355bfad55755ae7fdef69f649e4525bbca2f (diff) | |
| parent | 828a6a935e35e42805d45c882314afc5a9df3b66 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e7c8fcb8c5 -s ours am: 81ed4d7250 -s ours am: 828a6a935e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12518323
Change-Id: I5e5e7a34980f9550018944990200a377c203622c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions