tree 382904644d26733e0cafd295924397e81198a634
parent 5a1195fd5faf40428bc98e5bc24d09edbf3c3b6c
author Matthew Xie <mattx@google.com> 1341014251 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342499352 -0700

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