Commit 2d6d861d authored by Brett Chabot's avatar Brett Chabot Committed by android-build-merger
Browse files

[automerger skipped] Merge "Adjust to new androidx.test beta02 rules." am:... 

[automerger skipped] Merge "Adjust to new androidx.test beta02 rules." am: b312837c am: ff094869
am: 2d61bdf7  -s ours

Change-Id: If6947b06c5d3f82c826e8de3d80ae9f7f2934521
parents d6279b07 2d61bdf7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment