OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4c78306) | patch
Fix the build.
authorJim Miller <jaggies@google.com>
Wed, 24 Apr 2013 01:34:46 +0000 (18:34 -0700)
committerJim Miller <jaggies@google.com>
Wed, 24 Apr 2013 01:34:46 +0000 (18:34 -0700)
commita3b5bae9cf9e28e5d461c543e9c3fc7920a2330c
tree73c76cc8c3fe7e9805738c37d8450a912a5ffaf6tree | snapshot
parent4c78306617dd67b92fdf19101c5dfde4e21172d9commit | diff
Fix the build.

This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
services/java/com/android/server/LockSettingsService.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help