tree 73c76cc8c3fe7e9805738c37d8450a912a5ffaf6
parent 4c78306617dd67b92fdf19101c5dfde4e21172d9
author Jim Miller <jaggies@google.com> 1366767286 -0700
committer Jim Miller <jaggies@google.com> 1366767286 -0700

Fix the build.

This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa