summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/6
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-04-23 18:34:46 -0700
committerJim Miller <jaggies@google.com>2013-04-23 18:34:46 -0700
commita3b5bae9cf9e28e5d461c543e9c3fc7920a2330c (patch)
tree73c76cc8c3fe7e9805738c37d8450a912a5ffaf6 /docs/html/sdk/api_diff/6
parent4c78306617dd67b92fdf19101c5dfde4e21172d9 (diff)
Fix the build.
This fixes a bad merge in LockSettingsService. Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa
Diffstat (limited to 'docs/html/sdk/api_diff/6')
0 files changed, 0 insertions, 0 deletions