diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-01 13:52:19 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-01 13:52:19 -0700 |
| commit | 1ffc20b948b059e73497da8babb9671b24eb9ed1 (patch) | |
| tree | 9f302eecaf0a32f592a4d088f39729e73b260cf6 /tools/aapt/StringPool.cpp | |
| parent | 334ef5484bc5e427ebcd8c1641cc5dd799affec2 (diff) | |
| parent | 85a2c7f1cad8fd55ed72a8a3dbb2b36632ebbff3 (diff) | |
| download | frameworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.zip frameworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.tar.gz frameworks_base-1ffc20b948b059e73497da8babb9671b24eb9ed1.tar.bz2 | |
manual merge of 85a2c7f because of trivial conflict
Diffstat (limited to 'tools/aapt/StringPool.cpp')
| -rw-r--r-- | tools/aapt/StringPool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp index 878d3b1..715170a 100644 --- a/tools/aapt/StringPool.cpp +++ b/tools/aapt/StringPool.cpp @@ -228,7 +228,7 @@ status_t StringPool::writeStringBlock(const sp<AaptFile>& pool) } dat += (preSize+strPos)/sizeof(uint16_t); if (lenSize > sizeof(uint16_t)) { - *dat = htods(0x8000 | ((strSize>>16)&0x7ffff)); + *dat = htods(0x8000 | ((strSize>>16)&0x7fff)); dat++; } *dat++ = htods(strSize); |