diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:29:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:29:54 +0000 |
commit | e91eaccd32193e7b7d79a98b49c109eb607fba04 (patch) | |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 48bea730ebdcf10accfc21eb9239fbdc31bebb30 (diff) | |
parent | 7fc8a3361ebfc67663abd60e7971ee0133284ba2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: 7fc8a3361e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155
Change-Id: I21d4865e18443744e3803a16e2cc9b859413da49
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions