commit | 1ed9046617480ff6e9cb8c878e4b772a90efc405 | [log] [tgz] |
---|---|---|
author | Ben Gruver <bgruv@google.com> | Fri Jan 22 21:27:44 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 22 21:27:44 2016 +0000 |
tree | 48791e60e9b0dbc9a11d5a0f0d5c33b9a03dfdb6 | |
parent | cda00b15d2b7bae774f332f0b5f568c32d45f251 [diff] | |
parent | 87904e83f9fb982e35dbd15d74efa123e1282a71 [diff] |
Merge "Specify the time units for waitForActivityWithTimeout"