diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 11:09:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 11:09:26 +0000 |
| commit | ebf0113be08875667b7c2798d9af320448707f8f (patch) | |
| tree | d071c12d33cd7bd89ec76b00223e794b2b06c2c8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ce4bbdb4c587e84a94572efefd6885c5820c7d4a (diff) | |
| parent | 0b43c0f70e617d30fa3cb54430764716f277f04c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8553f99ac -s ours am: 324645af29 -s ours am: 0b43c0f70e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514865
Change-Id: Ia124cfced3352013a8a3570a81841401483a6703
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions