From: Eric Fischer <enf@google.com>
Date: Wed, 2 Sep 2009 18:19:19 +0000 (-0700)
Subject: am 66c70e13: Merge change 23529 into eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/b5c44fc2020ba03b86517dd7132938830b65502c?hp=1782ef54064d06ed12eea07fee7e1f802db84645

am 66c70e13: Merge change 23529 into eclair

Merge commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e' into eclair-plus-aosp

* commit '66c70e13d9f39cf82df8542fe53f2049d3f2062e':
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
---

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);