diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-03 04:44:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 04:44:12 +0000 |
commit | 4ec3aa4d09ff5ef3e88ee60a886da7d248605032 (patch) | |
tree | 663453f92f06729f2f865238660bd9f7368dd159 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fbeb0ef04f5fb3c26525260d8e7441e02bce6cab (diff) | |
parent | dd7986c31a490c6707d7ebf3b37c8a9bf306419f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dd7986c31a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515618
Change-Id: I6e1f7cf48e53488a373122b703e264f63ee6d664
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions