From: Alison Cichowlas <asc@google.com>
Date: Tue, 13 Jun 2017 11:20:39 +0000 (+0000)
Subject: Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev... 
X-Git-Tag: android-x86-9.0-r1~797
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7fe3dfc46d1fa749c9067752f09f09742d4b5c4c;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix build - fix import of SettingsRobolectricTestRunner." into oc-dr1-dev am: 39efd4ec44
am: 8421bc0d29

Change-Id: Idd4c4eb94d2dde5ec9038c43271769db3d6064a9
---

7fe3dfc46d1fa749c9067752f09f09742d4b5c4c