OSDN Git Service

Fix Robolectric test on oc-dev. DO NOT MERGE am: 8352421baa
authorMaurice Lam <yukl@google.com>
Thu, 27 Apr 2017 19:44:39 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Apr 2017 19:44:39 +0000 (19:44 +0000)
am: 9e7debc8a3

Change-Id: Ia75a0fe1332a9c0a7e8a90117a9c1fbb3b713a6c


Trivial merge