OSDN Git Service

Merge "Fix robolectric test failure" into oc-dev
authorFan Zhang <zhfan@google.com>
Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc


Trivial merge