[automerger skipped] Merge "Revert "Add systrace tag for system property"" am: 00e6e9cd26 -s ours am: 09adeddd2a -s ours am: a4ad343ea2 -s ours

Browse Source

am skip reason: Merged-In Id78992d238a73257bb9b80bfaa6bbfeb16f477d8 with SHA-1 7dc8bf4acf is already in history. Merged-In was found from reverted change.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767730

Change-Id: I4490460f98c8009ff10c4d3d2f984dddbdc13b90

...

This commit is contained in:

Treehugger Robot

2021-07-21 12:27:48 +00:00

committed by Automerger Merge Worker

parent 80d9010787 a4ad343ea2

commit 07a7cf045f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available