Commit 7bfe667f authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 15244615: (-s ours) Reconcile with jb-mr2-release - do not merge 

* commit '15244615':
  short-term fix for flaky CTS tests that need focus
parents a5ff1613 15244615
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