diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:15:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:15:47 +0000 |
commit | 8caaa711c6399e97b7fde0407a546fd46c536dc8 (patch) | |
tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c0ab918d545f0da7394d7c83bd34c89f8b462ae9 (diff) | |
parent | c110ac2338dd4ea61747f311a3c88cbcb2acb6d3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13175748
Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions