OSDN Git Service

Merge "Specify the time units for waitForActivityWithTimeout"
authorBen Gruver <bgruv@google.com>
Fri, 22 Jan 2016 21:27:44 +0000 (21:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jan 2016 21:27:44 +0000 (21:27 +0000)

Trivial merge