OSDN Git Service

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

Change-Id: Ib759754fac8ecc99c24f633b786e072630705d80