OSDN Git Service

Merge changes Ifbc8b4dd,I96a4e3bf
authorMike Lockwood <lockwood@google.com>
Thu, 22 Mar 2012 22:14:05 +0000 (15:14 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Mar 2012 22:14:05 +0000 (15:14 -0700)
commitca1f596677639ce6e2e2c50db02f2f4c95069ee1
tree4a46bdee4974e8443323eaf4f2f81677db63ab2b
parent11c0ab9a0810a9007228db197acd27c274f0d08d
parentc1c0ced6698978cb4226148a422503fdac6b59b5
Merge changes Ifbc8b4dd,I96a4e3bf

* changes:
  Add config_wifi_driver_stop_delay to public.xml to fix build
  WifiStateMachine: Move wifi teardown delay to a framework resource