| commit | 9bfec916a47ddf7ae28b1f341a5c0a45f90799c7 | [log] [tgz] |
|---|---|---|
| author | Kevin Ma <kma@google.com> | Wed Jun 11 21:37:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 21:37:35 2014 +0000 |
| tree | 71bc66f81d107e95da19ce76dd892b06e77493ee | |
| parent | 7a03a9b3fa95404c0078154e9ace676e0f995b92 [diff] | |
| parent | 492268689201f4ad4704eb68bbaaf39042cae386 [diff] |
am 49226868: resolved conflicts for merge of b18a277a to klp-modular-dev-plus-aosp * commit '492268689201f4ad4704eb68bbaaf39042cae386': Add a sleep in testSetDismissMessage(), to allow enough time for the dialog to be dismissed. No failure in 20+ tests.