Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev

author Jim Miller <jaggies@google.com>

Wed, 2 Mar 2016 23:01:58 +0000 (23:01 +0000)

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

Wed, 2 Mar 2016 23:01:59 +0000 (23:01 +0000)
author Jim Miller <jaggies@google.com>
Wed, 2 Mar 2016 23:01:58 +0000 (23:01 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 2 Mar 2016 23:01:59 +0000 (23:01 +0000)
diff --cc services/core/java/com/android/server/LockSettingsService.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 2 Mar 2016 23:01:58 +0000 (23:01 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 2 Mar 2016 23:01:59 +0000 (23:01 +0000)