| commit | ff6068abbf4a7e0200266b9cd968945d2f44a8b4 | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Tue Apr 04 09:07:17 2023 +0000 |
| committer | Nataniel Borges <natanieljr@google.com> | Tue Apr 04 09:07:17 2023 +0000 |
| tree | 1d7f87c456ba1e42fb5fab3fb687c077fbcd0701 | |
| parent | 0f2e3fe8a5a2abba542b58e5ac15bddecfa776dd [diff] |
[DO NOT MERGE] Compatibilize with git_master Both branches diverged, they shouldn't. This CL compatibilizes master with changes from udc-dev that were not merged upstream Bug: 237278810 Test: atest FlickerLibTest Change-Id: I451fc1d77b24ab15c3d91ba7d3b909cfb4134b28