From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Tue, 28 Nov 2017 22:43:30 +0000 (+0000)
Subject: Merge changes I886a7277,I25d96c82
X-Git-Tag: android-x86-9.0-r1~147^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=183674b938f7f792298c56843f6d242ef5a9785c;p=android-x86%2Fpackages-apps-Settings.git

Merge changes I886a7277,I25d96c82

* changes:
  Move development test package to sdk 26
  Move OemUnlockPreferenceControllerTest to sdk 26
---

183674b938f7f792298c56843f6d242ef5a9785c