resolved conflicts for merge of 06a8ceac to master

[android/aapt.git] / StringPool.cpp

diff --git a/StringPool.cpp b/StringPool.cpp
index e28bdff410b0a9a28e9978129c1e6e28a956d795..d067d59006c66140f88339f6ea717bf0dcc05f8c 100644 (file)
--- a/StringPool.cpp
+++ b/StringPool.cpp
@@ -30,7 +30,7 @@ void printStringPool(const ResStringPool* pool)
             str = String8(pool->stringAt(s, &len)).string();
         }
 
-        printf("String #%d: %s\n", s, str);
+        printf("String #%zd: %s\n", s, str);
     }
 }