summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-18 10:52:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 10:52:33 -0700
commitdba120535f2b76bda83f7c2b300721ef54a488e3 (patch)
treec45047a1afcf9002c0d80c5ab164b487ebe13880 /res/values
parent02638f106ef91b0baea925e6ce79dc2103c1eecd (diff)
parentfe5a72dae2e7abc985b90641945e754492a20b67 (diff)
downloadpackages_apps_Settings-dba120535f2b76bda83f7c2b300721ef54a488e3.zip
packages_apps_Settings-dba120535f2b76bda83f7c2b300721ef54a488e3.tar.gz
packages_apps_Settings-dba120535f2b76bda83f7c2b300721ef54a488e3.tar.bz2
am fe5a72da: am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
* commit 'fe5a72dae2e7abc985b90641945e754492a20b67': Fix issue #6664140: Time to lock should work even Stay awake...
Diffstat (limited to 'res/values')
0 files changed, 0 insertions, 0 deletions