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