tree fb97a20d22a8595ee8cb3f5df37281b7fd9c2a82
parent 87bba84dbc1e71b1bf96cf87c4944416d2ea5440
parent 451e52f8bbe901f0fbc70b0bac9616e84e27a692
author Hector Dearman <hjd@google.com> 1646044638 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646044638 +0000

Merge "Stop including systrace in platform tools" am: 03f2a0c5e6 am: 451e52f8bb

Original change: https://android-review.googlesource.com/c/platform/development/+/1914938

Change-Id: Ie0743a33b49555226b637ae16d592403f6108b8a