OSDN Git Service

Merge "Fix flaky tests" into oc-dev am: b80cffad4b
authorJorim Jaggi <jjaggi@google.com>
Thu, 25 May 2017 17:02:34 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 17:02:34 +0000 (17:02 +0000)
am: 9c0e3b433b

Change-Id: I7b21decefdea2bc52a6b9c1283d0189724091488


Trivial merge