diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-09 06:21:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-09 06:21:38 +0000 |
| commit | 086a2cdbf38266c42280945fe95139aa59e6028f (patch) | |
| tree | 7da2cda3a2d109c7bc847de66115a39b505a9653 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b1483f72682723e3e2fda24944d3f458f648fa16 (diff) | |
| parent | 895e02110043279bbb5899fc9cd56c4f89a9ee3d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1015bae311 -s ours am: 838bc9752b -s ours am: 895e021100 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12796397
Change-Id: I5fbd090a2a65d60446963f934cf2bae46ec15c8f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions