OSDN Git Service

Merge "Set device credential's Window flag to be SECURE." into mnc-dev
authorFan Zhang <zhfan@google.com>
Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)
commitcd66862b08ac16644693d9ff49edec5af10bbd78
tree99f68f1e7fc9889425035e714c25a7e6480ceb00
parent2bf724509c951b6f1ad464c0b8d369e9a247f8d9
parent8bffdc26134359784ffa144222267ba2b6eafe88
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am: 8bffdc2613

Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java