diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-30 03:47:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-30 03:47:47 +0000 |
| commit | 6d87612eea77ccf887cc388a90b710d5d96d0731 (patch) | |
| tree | 639b007cf460c0355077fd5472ddf8907292e61b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ee26c43558dd97fb04d68534a68ba67390b50ff (diff) | |
| parent | 39779af8fd0121973311b7fff144047227a80d09 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea82d90e45 -s ours am: ddf6d2b666 -s ours" into rvc-d1-dev-plus-aosp am: 39779af8fd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12951854
Change-Id: Ib1eac14386224c6210d74d13c70c70adb992ed78
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions