summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-07 09:10:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-07 09:10:21 -0700
commit5b49d0760728a8c49e2f211eb44832f896f82807 (patch)
tree4da2f12e0fbf0cc56f1c3f6a3d75190b1b280bba /services
parent73380439b989ffcba54080a65d5668731c90692b (diff)
parent0ecb72e6d27c360025fd9ceda0c06929da98b414 (diff)
downloadframeworks_base-5b49d0760728a8c49e2f211eb44832f896f82807.zip
frameworks_base-5b49d0760728a8c49e2f211eb44832f896f82807.tar.gz
frameworks_base-5b49d0760728a8c49e2f211eb44832f896f82807.tar.bz2
am 0ecb72e6: am 00a68f4e: am 2ec390d1: Merge "Increase lock screen timeout when on custom widget page." into jb-mr1-dev
* commit '0ecb72e6d27c360025fd9ceda0c06929da98b414': Increase lock screen timeout when on custom widget page.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions