summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-06 22:51:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-06 22:51:59 -0700
commit2ec390d1ea18eb7f232ce89f7294dc5e640f8b21 (patch)
tree40d02006573d24bfde608018d0060ba1f1ca618d /services
parent1ad0fd9c04ae2e352c59129b979145e662f25cbc (diff)
parentc7505bc9dddcb0655302c1598e966bf121586ebe (diff)
downloadframeworks_base-2ec390d1ea18eb7f232ce89f7294dc5e640f8b21.zip
frameworks_base-2ec390d1ea18eb7f232ce89f7294dc5e640f8b21.tar.gz
frameworks_base-2ec390d1ea18eb7f232ce89f7294dc5e640f8b21.tar.bz2
Merge "Increase lock screen timeout when on custom widget page." into jb-mr1-dev
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions