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)
am: 030107f0bd

Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47


Trivial merge