diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 08:21:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 08:21:57 +0000 |
commit | aca4566be72a6e7cddff73be93645ba63a09c870 (patch) | |
tree | faa2874e67fc4d971e2d00a7a5515aa1f0596076 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cbc7b55c3d3e11f42f778b129b30a3ca308c5284 (diff) | |
parent | 47d8fdb784fdbb509ae01fa62ad6684eba78463b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ec08343fc5 -s ours am: 063c5052f8 -s ours am: 47d8fdb784 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419990
Change-Id: I4fed67b6cadf9a445a1495c3667819e86fb0b70d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions