diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 09:02:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 09:02:40 +0000 |
| commit | 6b67a195c5a7ee253b6bf7964429a8585a7c6c02 (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e9c2ea160dbab52b34e85195db3c0835974f64a (diff) | |
| parent | 1dc4a9c0dc3b235de6653c6ed4902bf8d87bebb3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21952d24d6 -s ours am: 0d6d7a7495 -s ours am: c8581eab83 -s ours am: 97714cd352 -s ours am: 1dc4a9c0dc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419989
Change-Id: I84b2d8be3546d2a38b0d27df5aab38f42a97d44d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions