Merge "Fix fingerprint swipe gesture settings for secondary users." into nyc-mr1-dev

author Doris Ling <dling@google.com>

Wed, 10 Aug 2016 17:08:12 +0000 (17:08 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 10 Aug 2016 17:08:13 +0000 (17:08 +0000)
author Doris Ling <dling@google.com>
Wed, 10 Aug 2016 17:08:12 +0000 (17:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Aug 2016 17:08:13 +0000 (17:08 +0000)
diff --cc services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge
author	Doris Ling <dling@google.com>
	Wed, 10 Aug 2016 17:08:12 +0000 (17:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Aug 2016 17:08:13 +0000 (17:08 +0000)