Skip to content
Commit ff6068ab authored by Nataniel Borges's avatar Nataniel Borges
Browse files

[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
parent 0f2e3fe8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment