From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Fri, 1 Dec 2017 20:44:30 +0000 (+0000)
Subject: Merge changes I37c5df89,I453d8359
X-Git-Tag: android-x86-9.0-r1~145^2~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f678be39f503de87d5bd5ee323b46d032ffde8f8;p=android-x86%2Fpackages-apps-Settings.git

Merge changes I37c5df89,I453d8359

* changes:
  Move password test package to sdk 26
  Add resourceImpl shadow to tests for sdk 26
---

f678be39f503de87d5bd5ee323b46d032ffde8f8