summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-01-10 10:34:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-10 10:34:51 -0800
commit5437c220e239dc6276942990bc81c1388cfb176c (patch)
treee7324a7a036e03808450d39970e2586dae43cac8 /docs/html
parent251f0485440cc8202308ce6c00cbc56b207ded55 (diff)
parentd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2 (diff)
downloadframeworks_base-5437c220e239dc6276942990bc81c1388cfb176c.zip
frameworks_base-5437c220e239dc6276942990bc81c1388cfb176c.tar.gz
frameworks_base-5437c220e239dc6276942990bc81c1388cfb176c.tar.bz2
am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2': Fix 4560303: Add setting to lock later when power button pressed
Diffstat (limited to 'docs/html')
0 files changed, 0 insertions, 0 deletions