tree 6544a5609fc6bec109f9bb4f956134fbad2772f0
parent a0042742c8941519718cc8872a84cfec10294386
parent 187ec581c66fec49a5ee7db8edec6d9eb0e209fc
author Jim Miller <jaggies@google.com> 1366231198 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366231198 +0000

Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev