diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-06-18 10:52:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:52:33 -0700 |
commit | dba120535f2b76bda83f7c2b300721ef54a488e3 (patch) | |
tree | c45047a1afcf9002c0d80c5ab164b487ebe13880 /res/values | |
parent | 02638f106ef91b0baea925e6ce79dc2103c1eecd (diff) | |
parent | fe5a72dae2e7abc985b90641945e754492a20b67 (diff) | |
download | packages_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