summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/6/changes
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-10-18 00:12:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-18 00:12:49 -0700
commit0ad3bb8b36d4a2532af74f80a6988bbcb5d1f663 (patch)
tree2fffccca78972727e51a489565a43b27e5b994ea /docs/html/sdk/api_diff/6/changes
parent80ffd26f873ecd7d2827f331eda11064647e44e9 (diff)
parent88c66cbb00a572ac8280f0e0ea38079d48ec59f3 (diff)
am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '88c66cbb00a572ac8280f0e0ea38079d48ec59f3': Dream when user activity times out while docked if appropriate.
Diffstat (limited to 'docs/html/sdk/api_diff/6/changes')
0 files changed, 0 insertions, 0 deletions