diff options
| author | Michael Groover <mpgroover@google.com> | 2021-02-10 00:28:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-10 00:28:29 +0000 |
| commit | 22f0fc0ee3289c1fad1b816da8df979da2cd136f (patch) | |
| tree | cccd5e7e79c34af6b8bcce4b4ad963e1a64821d3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fb11991c1e77e7ddec04db92e8ad3f449afe0ec9 (diff) | |
| parent | 58c483b685fb45a773e051276951dffd6ae79df6 (diff) | |
[automerger skipped] resolve merge conflicts of 540b50bbe7397304436e3bbb63957c0cb265dbce to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours am: 58c483b685 -s ours
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518142
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6c6ea8965bacf39b8d05fa285de487394a053980
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions