summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-06-18 10:49:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-18 10:49:38 -0700
commitd466fe463b6c4a1a5694d5a42810af60ad782a2c (patch)
tree8efc406e7e1248129a2520b940906265f601a6c3 /docs/html/sdk/api_diff/12/changes
parent00b7ae0936c555079e622237e8499613a073381c (diff)
parent608601924651531210ad3c6179d02c471f42dddf (diff)
am 60860192: am d8bbf96a: Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '608601924651531210ad3c6179d02c471f42dddf': Fix issue #6664140: Time to lock should work even Stay awake...
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions