Skip to content
Commit c745b599 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: 51b6c766 -s ours 

am: c4d53ba7 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f3a2bb325bb5870101b70206879c02ae2077683
parents edf0d51c c4d53ba7
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