OSDN Git Service

Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev...
authorAlison Cichowlas <asc@google.com>
Tue, 13 Jun 2017 11:20:39 +0000 (11:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 11:20:39 +0000 (11:20 +0000)
am: 8421bc0d29

Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9


Trivial merge