Commit af2e3ec9 authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am 526ec7d6: resolved conflicts for merge of b1092aea to jb-mr1-dev 

* commit '526ec7d6':
  Add UiAutomator test skeleton to CTS.
parents 546334a8 526ec7d6
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