From: Fan Zhang <zhfan@google.com>
Date: Fri, 3 Nov 2017 00:31:01 +0000 (+0000)
Subject: Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c... 
X-Git-Tag: android-x86-9.0-r1~25^2^2~3^2^2~1^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d15a81f88246bddc9d35337ccbd95bdfff6af5e9;p=android-x86%2Fpackages-apps-Settings.git

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414  -s ours am: b17703e871  -s ours am: 1de093b1a1  -s ours am: 5f02135c42  -s ours am: 7690482014  -s ours am: dbbcf65c96  -s ours am: e6a8f354fc  -s ours
am: 3c19043e9c  -s ours

Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
---

d15a81f88246bddc9d35337ccbd95bdfff6af5e9