From: Fan Zhang <zhfan@google.com>
Date: Thu, 18 May 2017 01:01:12 +0000 (+0000)
Subject: Merge "Fix robolectric test failure" into oc-dev
X-Git-Tag: android-x86-9.0-r1~852^2~87
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3970916cf1;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix robolectric test failure" into oc-dev
am: 2545bcaa74

Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
---

3970916cf19405777c3b197f5086547f92d1520f