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)
commit7fe3dfc46d1fa749c9067752f09f09742d4b5c4c
treef120441bf4b991c049fe4f30de8073d7515081e0
parentb82e7ac9f5ad879c93fb4b20ebc18457f70a0252
parent8421bc0d29da73f274466b3367bbfdb6ec114fb4
Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am: 39efd4ec44
am: 8421bc0d29

Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9