From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Thu, 30 Nov 2017 01:38:33 +0000 (+0000)
Subject: Merge "Fix unit test for PreferenceController"
X-Git-Tag: android-x86-9.0-r1~146^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef48f651346db1e84af3c32bd441a20a3169529c;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix unit test for PreferenceController"
---

ef48f651346db1e84af3c32bd441a20a3169529c