diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-28 17:24:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-28 17:24:44 +0000 |
| commit | aa70826ca7f4f3e7049c245e2ecacfc6c873d166 (patch) | |
| tree | 934e33633a2479d79cb13473aa8f2a4bc76101d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 80c0cdab88f7b3b3f67283502514e6bcdebfa294 (diff) | |
| parent | 691b69364dfa2fba12dddaa3534730a42b4dffbf (diff) | |
[automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours am: 78ad33b608 -s ours am: 691b69364d -s ours
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982320
Change-Id: I39ca33bc59c432aba0c5bcc8b0519f4ec9d04349
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions