diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:58:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:58:04 +0000 |
| commit | de58902b7a14df71981be57e2a00fd8eb644190e (patch) | |
| tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c34f640b9d836af0eb58465087c858b9c682cc2 (diff) | |
| parent | 5bb0f603f956e118f06abcf5a683b2012caf05b6 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master am: da7ac9e54c -s ours am: 5bb0f603f9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519386
Change-Id: I5276f5f1be73c5daa82276f2cf1e5ae09c638e2b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions