summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/12/changes
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2012-06-29 16:57:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 21:29:12 -0700
commit9631314e3d28b6e96ef0b7cc777f1a7747a0ac39 (patch)
tree382904644d26733e0cafd295924397e81198a634 /docs/html/sdk/api_diff/12/changes
parent5a1195fd5faf40428bc98e5bc24d09edbf3c3b6c (diff)
Fix merge error, put in tmp workaround for input manager.
Fix merge error, missing enableNoAutoConnect api. Remove bluetoothF from inputManageF.systemReady call as tmp workaround. Recover shutdownRadios(MAX_RADIO_WAIT_TIME) call in ShutdownThread Change-Id: Ice2b5c54267755bdbf56c742feabbb8709b92570
Diffstat (limited to 'docs/html/sdk/api_diff/12/changes')
0 files changed, 0 insertions, 0 deletions