| commit | 041eb1d49db30d1bda4036f55633770cac7effcc | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 09 14:22:25 2009 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 09 14:22:25 2009 -0700 |
| tree | 652675b2a3d03f5a5e5e01a961731c0328520997 | |
| parent | a641ef60d5c7fa80e68260b3edd954ff2b86225f [diff] | |
| parent | 97cb82a7402931e6cd2d682f8bc903ef51114735 [diff] |
Merge change 6661 into donut * changes: wifi: WifiManager.startScan() will now do passive scans by default.
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 109f28d..87edb01 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp
@@ -1573,7 +1573,6 @@ status_t ResTable::add(ResTable* src) { mError = src->mError; - mParams = src->mParams; for (size_t i=0; i<src->mHeaders.size(); i++) { mHeaders.add(src->mHeaders[i]);