summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/11/changes
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-11-18 14:47:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-18 14:47:58 -0800
commit6686effc613fb92218ee3288136a9c0fec0b6417 (patch)
tree2df7350e1e2a2824a169badc851791290b233a0e /docs/html/sdk/api_diff/11/changes
parent74b7c892cb1465bd85e6fc5e4db77051f8f39bd6 (diff)
parent2e56995e9e19f18958167a28911120f31b096756 (diff)
am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '2e56995e9e19f18958167a28911120f31b096756': Tie screen saver to the screen off timeout.
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions