diff options
author | Xin Li <delphij@google.com> | 2021-08-13 21:20:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 21:20:27 +0000 |
commit | a767237a32d2331e8510e6ba1941cf042e97f1bc (patch) | |
tree | 5b7c6a440f3cd0889923523e294b8b809cea0122 | |
parent | a4c3ad90b5c778d70d5f97aaf299c6008a629972 (diff) | |
parent | cca18e1ce036e31b2f8df4571355cba45db0c33c (diff) | |
download | perfetto-a767237a32d2331e8510e6ba1941cf042e97f1bc.tar.gz |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 863f92ecb9 -s ours am: cca18e1ce0 -s ours
am skip reason: Merged-In I3fe41e4a10d06b02610729bc22c926e923399366 with SHA-1 3a9c0ef08c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/perfetto/+/15546168
Change-Id: I24157e747074dc49e51b47da7d3d55241ae5dcb2
0 files changed, 0 insertions, 0 deletions