From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 29 Nov 2017 22:51:27 +0000 (+0000)
Subject: Merge "Fix robolectric tests"
X-Git-Tag: android-x86-9.0-r1~146^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7ec34c1781ade567d08d7f589b88d6cf0f759e1a;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix robolectric tests"
---

7ec34c1781ade567d08d7f589b88d6cf0f759e1a