diff options
author | Christopher Tate <ctate@google.com> | 2021-06-25 18:57:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-25 18:57:38 +0000 |
commit | 5256a6fdb7e656dbe3f6cc2e033b8a9efacb6a6a (patch) | |
tree | eeac3eee363c8b75a910645674c1fe01f9f4ce4c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8a3c22afbadaa761a7289fa4050d703d43f99690 (diff) | |
parent | 2b7b72968e0ff5067739bfb2449ecaa5cf6b2bb2 (diff) |
[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a am: 2b7b72968e -s ours
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 468aeab7e7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641
Change-Id: Ib9b1a4c45844028e95a4cf9b5701231e79b78d3b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions