diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:54:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:54:56 +0000 |
commit | 356f524578ef017eb3b56a4faccb24c4334b333c (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ff89071529a702c80782ca334a64a2abe1a2029d (diff) | |
parent | 568f7ec214dba806a9454bf91a5da49a7b7c958f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5df84b4f36 -s ours am: 91e53f88c4 -s ours am: 568f7ec214 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420413
Change-Id: If81e7d029c9f52ab17367093f0c642d1f1aedf10
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions