| commit | 1c7ac129dc277cda705deac3d8b561b19d9e11ad | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Mon Jan 09 14:21:37 2023 +0000 |
| committer | Nataniel Borges <natanieljr@google.com> | Mon Jan 09 14:40:36 2023 +0000 |
| tree | c30581325286e634345fccbe90d9bed135221556 | |
| parent | 8e25c2ed36ce5aa2fc2f9c104371cb256be08b13 [diff] | |
| parent | ed614292501abf6f5be81419a0e7ceba2f242cea [diff] |
[conflict] Merge "Update winscope proxy to version 1.0" am: 20b563e65e am: 1130743c2c am: ed61429250 Original change: https://android-review.googlesource.com/c/platform/development/+/2379888 Change-Id: I4f69afe94fc6510c5975d07c2883ba82334cb30c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>