am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk

Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp

* commit '0d55daffc31c123dcf83f6db85f8198854ddc564':
  doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.

diff --git a/Command.cpp b/Command.cpp
index 1a536d6a80853aa5315ec4baedf3a3faa96724ec..4067735dd165f3022891181176b380a06c9d3c5c 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -401,7 +401,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
-                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
+                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                 goto bail;
             }
 
@@ -427,7 +427,7 @@ int doDump(Bundle* bundle)
             ResXMLTree tree;
             asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
             if (asset == NULL) {
-                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
+                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                 goto bail;
             }
 

diff --git a/StringPool.cpp b/StringPool.cpp
index 878d3b1fea7e1cd902c73fae6669c677034ef125..715170aedfebfebe39c98c5e42b1b73eb23fc94d 100644 (file)
--- 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);