| commit | 1a8ca4a1a42c3e97daba2ff882fc81a87f47141e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu Jun 07 21:52:50 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 07 21:52:50 2018 +0000 |
| tree | d45a05ad2e95104d1dbf4f15b61888f4499e405e | |
| parent | efc8fdb669710154a3f45102dbba26dc5006c0bc [diff] | |
| parent | 7dddee30f0289eac111ec974d88b5a8ec1af7e28 [diff] |
Merge "Merge "Hide backdrop when waking up from fp" into pi-dev am: e752b75dad am: 8c24406355"
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java index 8778ae9..914d182 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java
@@ -54,7 +54,7 @@ final List<ResourcePath> paths = super.getIncludedResourcePaths(); paths.add(resourcePath("file:frameworks/base/packages/SettingsLib/res")); paths.add(resourcePath("file:frameworks/base/core/res/res")); - paths.add(resourcePath("file:frameworks/support/v7/appcompat/res")); + paths.add(resourcePath("file:frameworks/support/appcompat/res")); return paths; } };