summaryrefslogtreecommitdiff
path: root/docs/html/guide/guide_toc.cs
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-01-17 17:03:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-17 17:03:51 -0800
commitd0861c8992356296115dc203feb50ce8a8794bd9 (patch)
tree204d404270a5782662af45c5dbb10533218f88f1 /docs/html/guide/guide_toc.cs
parent9ef6ec98769b6d9a1d7aaa68dde7d4cf66285998 (diff)
parent3d7a9707a58bb043147f30dc81c61deeeffeeef7 (diff)
am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb
* commit '3d7a9707a58bb043147f30dc81c61deeeffeeef7': Fix 3210299: Extend lock screen wake timeout to 10s
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
0 files changed, 0 insertions, 0 deletions