Commit 9bfec916 authored by Kevin Ma's avatar Kevin Ma Committed by Android Git Automerger
Browse files

am 49226868: resolved conflicts for merge of b18a277a to klp-modular-dev-plus-aosp 

* commit '49226868':
  Add a sleep in testSetDismissMessage(), to allow enough time for the dialog to be dismissed. No failure in 20+ tests.
parents 7a03a9b3 49226868
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