| commit | 5b8428faf858a2cb014dd0e41b10f4361fbbc885 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Jun 25 19:47:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 25 19:47:36 2021 +0000 |
| tree | fa0420ef7b33e4e0bab420508f2444b7b8947cd5 | |
| parent | 31c83706b0ce167d1eafab027150c0ae908d1bb8 [diff] | |
| parent | 5e3e5e9177f2d6ca5213187e6264511bbdbb7dff [diff] |
[automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 6984eaa9f4 -s ours am: 67fcd26956 -s ours am: d5745e3249 -s ours am: 490b2477b8 -s ours am: 7ab155c97c -s ours am: 5e3e5e9177 -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/+/14983170 Change-Id: I76c04a72ca9ecc5ecb2eff5b7feb7f05752382a3