From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 1 Sep 2009 18:46:14 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/0ff29cbb9fe68cc9e3a1f90ec67ef5fd69f94994?hp=21c5c61adf6057d794d60b3623af4506bcc182e6

merge from open-source master
---

diff --git a/StringPool.cpp b/StringPool.cpp
index 878d3b1..715170a 100644
--- a/StringPool.cpp
+++ b/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);