OSDN Git Service

Merge \"Fix timeout in a test utility method\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 28 Jul 2016 17:48:41 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 17:48:41 +0000 (17:48 +0000)
am: 648d3030a7

Change-Id: I0dc46ba4967e3094f9d08aa490a70ae94efa3263


Trivial merge