diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 15:08:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 15:08:21 +0000 |
| commit | e1c57f6a0e5a3c9601cc38fdf7f21b86931c3374 (patch) | |
| tree | 6131e1f8debab82b8594819d9cc7d4b238415633 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b5d5d0d99c43e123e496c7546e9566d8e24599a4 (diff) | |
| parent | 523d30f631e1fc7be4692dad9e07d96ea8bcaf3c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a3d1d70981 -s ours am: 523d30f631 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762769
Change-Id: I7d70a6862d32c4fbab02dcf3a696578364ff2cbb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions