From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 29 Nov 2017 00:35:25 +0000 (+0000)
Subject: Merge changes I6b4c5d1d,I1b81bbdf
X-Git-Tag: android-x86-9.0-r1~147^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08ff0e8f53e8e9d87d6bba4895cdbc6b0e00404f;p=android-x86%2Fpackages-apps-Settings.git

Merge changes I6b4c5d1d,I1b81bbdf

* changes:
  Move enterprise test package to sdk 26
  Update ApplicationListPreferenceCtrlTest to sdk 26
---

08ff0e8f53e8e9d87d6bba4895cdbc6b0e00404f