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