From: Jeffrey Huang <jeffreyhuang@google.com>
Date: Wed, 29 Nov 2017 18:47:02 +0000 (+0000)
Subject: Merge changes Ieefdc9d1,Id2dad12b
X-Git-Tag: android-x86-9.0-r1~146^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=758dbeb83097eb4a7f69e0fa41d985dd8f8c2f02;p=android-x86%2Fpackages-apps-Settings.git

Merge changes Ieefdc9d1,Id2dad12b

* changes:
  Move fingerprint package to sdk 26
  Update DeleteFingerprintDialogTest to sdk 26
---

758dbeb83097eb4a7f69e0fa41d985dd8f8c2f02