summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/OwnerInfoSettings.java
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-01-10 10:28:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-10 10:28:31 -0800
commitaf48709993faeb0d3665eb6a491aaec701e1ccd5 (patch)
tree38ea171a6a6a65f38bf32c45a57643226eef80cc /src/com/android/settings/OwnerInfoSettings.java
parentaaff44c84f4e88184276064dff9e36eefde3ffcb (diff)
parent071742d838f9b0c312af309c87eaf2c444aeeab8 (diff)
downloadpackages_apps_settings-af48709993faeb0d3665eb6a491aaec701e1ccd5.zip
packages_apps_settings-af48709993faeb0d3665eb6a491aaec701e1ccd5.tar.gz
packages_apps_settings-af48709993faeb0d3665eb6a491aaec701e1ccd5.tar.bz2
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
Diffstat (limited to 'src/com/android/settings/OwnerInfoSettings.java')
0 files changed, 0 insertions, 0 deletions