tree 7a0ef4addfdeca63e8c795c15115987cfcfbf1f1
parent a40c2c46b293648b294a26199561add754edbc4b
parent 4383058bf4956f3a3132a58f0904087fdd569526
author Adrian Roos <roosa@google.com> 1429827339 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429827340 +0000

Merge "Migrate lockscreen.disabled on upgrade"