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)
commit024f0f7fe3eee0db8d1770e76d023b7ff43ae4f3
treead57d36da4a5377f3fe47f4cabf2b48648e04ce5
parent56542a3e1c1ad616e7dd0ef3f11ad2468fb83e51
parent648d3030a7410c439fe6cf8475559cac2a605218
Merge \"Fix timeout in a test utility method\" into nyc-mr1-dev
am: 648d3030a7

Change-Id: I0dc46ba4967e3094f9d08aa490a70ae94efa3263