| commit | 9631314e3d28b6e96ef0b7cc777f1a7747a0ac39 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Fri Jun 29 16:57:31 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 16 21:29:12 2012 -0700 |
| tree | 382904644d26733e0cafd295924397e81198a634 | |
| parent | 5a1195fd5faf40428bc98e5bc24d09edbf3c3b6c [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