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