Skip to content
Commit c4d53ba7 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 skip reason: subject contains skip directive

Change-Id: Ie8c749bbefa05cae3f5104be30dca0f08ae0a2c1
parents 2e431206 51b6c766
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