OSDN Git Service

Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev
authorJim Miller <jaggies@google.com>
Wed, 2 Mar 2016 23:01:58 +0000 (23:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Mar 2016 23:01:59 +0000 (23:01 +0000)
commit042a68ae3297db27c4bd6aca7f1c39001261b85e
treed1ed4532ed4ce96b4f29b192e5c419b2959be714
parent5d634d7828ed345c1cca46818a6beab1de0ab626
parent325c56741a4896741f3e3c5894c20ee55090a31b
Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev
services/core/java/com/android/server/LockSettingsService.java