OSDN Git Service

Merge "Fix flaky test?" into oc-dev
authorJason Monk <jmonk@google.com>
Mon, 1 May 2017 13:31:26 +0000 (13:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 13:31:26 +0000 (13:31 +0000)
commit16c981ea4356238e95401a6e77b4519d1e433c1b
treed7e5bf574cfa14dd66a4e10c368bfe1832b09a3e
parent5642a6559b20dd72fc5af187c08ad3a68b595f03
parent030107f0bdebb1d52838baab87b5d0146e6586b4
Merge "Fix flaky test?" into oc-dev
am: 030107f0bd

Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47