| commit | 5a3a9315d3482354dec39b13d3ec2fef60dee72a | [log] [tgz] |
|---|---|---|
| author | Parth Sane <parthsane@google.com> | Thu Jul 27 13:33:47 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 13:33:47 2023 +0000 |
| tree | 2250bb64eb0868d1d074d0fa8da6ad4695eb4120 | |
| parent | 656dca792eba1b37b3f8d9a5e6f82b5f1d5c09e5 [diff] | |
| parent | c4912c2b9d19b79479ef98e7294463a75a8b1ab3 [diff] |
[automerger skipped] Merge "Clean up atrace.rc" into main am: 945f3077c5 am: c4912c2b9d -s ours am skip reason: Merged-In I89e2bc0abe111bed4a230619afa544c214c10e6e with SHA-1 9bb5291102 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2648648 Change-Id: I09120fb16dfbbaa894a61a6e15dd7432f592641a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>