Jim Miller a3b5bae9cf Fix the build. ...

This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa

2013-04-23 18:34:46 -07:00

..

android/server

Fix the build.

2013-04-23 18:34:46 -07:00