Skip to content
Commit b286711b authored by Bernardo Rufino's avatar Bernardo Rufino Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP" am:... 

[automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP" am: 51b6c766 -s ours am: c4d53ba7 -s ours am: c745b599
am: 8d8cc552 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7038ee92755a4edf04fee347fb692d25564983b
parents 2ea518da 8d8cc552
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