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

Merge changes from topic "settings_presubmit_instr_test"

* changes:
  Refactor help menu stuff into a controller
  Fix UniquePreferenceTest
---

4031bc78e46a151c06b617c0274b5cf397820270