diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-09 14:12:52 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-09 14:12:52 -0700 |
| commit | 58e8131631b4598d445303183ee6ea80b7e63038 (patch) | |
| tree | 8a03eaa3f3c33a668ba1f01458a1fd5c5bacc56a /libs/utils | |
| parent | 191c12d33fe33c938beb421004c55fb827208f48 (diff) | |
| parent | be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5 (diff) | |
| download | frameworks_base-58e8131631b4598d445303183ee6ea80b7e63038.zip frameworks_base-58e8131631b4598d445303183ee6ea80b7e63038.tar.gz frameworks_base-58e8131631b4598d445303183ee6ea80b7e63038.tar.bz2 | |
am be91fdbc: Merge change 6665 into donut
Merge commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5'
* commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5':
Fix resources not being set correctly.
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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(Asset* asset, void* cookie, bool copyData) 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]); |