OSDN Git Service

Merge "Fix flaky tests" into oc-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 25 May 2017 16:53:34 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 16:53:34 +0000 (16:53 +0000)
commit9c0e3b433ba5add95a66684e056bd860db3e4643
treec4aa1c5052f6b58ef75c4ef8512d5d51087c9cb4
parenta376eed2636cacea63d4857ea250e2851520e0a5
parentb80cffad4bd64daf643302a99a9172c8536c27ff
Merge "Fix flaky tests" into oc-dev
am: b80cffad4b

Change-Id: Ia78dac2c9333a89f48a998b8df9b0f12e78da71c