diff options
| author | 2012-03-22 15:14:05 -0700 | |
|---|---|---|
| committer | 2012-03-22 15:14:05 -0700 | |
| commit | ca1f596677639ce6e2e2c50db02f2f4c95069ee1 (patch) | |
| tree | 4a46bdee4974e8443323eaf4f2f81677db63ab2b /libs/androidfw/AssetManager.cpp | |
| parent | 11c0ab9a0810a9007228db197acd27c274f0d08d (diff) | |
| parent | c1c0ced6698978cb4226148a422503fdac6b59b5 (diff) | |
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
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions