Matthew Xie 9631314e3d 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

2012-07-16 21:29:12 -07:00

..

java

Fix merge error, put in tmp workaround for input manager.

2012-07-16 21:29:12 -07:00

jni

Merge "Remove BT references from System Server."

2012-07-16 21:13:06 -07:00

res

Non persistent adapter service

2012-07-16 21:20:54 -07:00

tests

Merge commit '1b003ef0' into mit

2012-07-11 18:15:50 -07:00