summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/10/changes
diff options
context:
space:
mode:
authorUriel Rodriguez <urodriguez@google.com>2012-05-10 09:24:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-10 09:24:46 -0700
commit49eea136f81f1bda4577a55bea4f88ddd129996b (patch)
treedcf3ca40cd9e3e865a3d94314494ba2a67203387 /docs/html/sdk/api_diff/10/changes
parentc972f05cccd5fb344ee290aa73ab08da84163b74 (diff)
parent363b60527ce82b0f56434e70a8124e4d41e2b1e0 (diff)
am 363b6052: Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev
* commit '363b60527ce82b0f56434e70a8124e4d41e2b1e0': changed pokeWakelock() callback to take time in milliseconds
Diffstat (limited to 'docs/html/sdk/api_diff/10/changes')
0 files changed, 0 insertions, 0 deletions