am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
  Fix the single crunch command to return the right error code.

diff --git a/Resource.cpp b/Resource.cpp
index 77168f948640fa57abbc70094ebf313e4c5be0af..9c2e1b9127f1947c937cfb61eafb1df7c5354288 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -1946,7 +1946,7 @@ static status_t writeTextLayoutClasses(
                 const bool pub = (typeSpecFlags&ResTable_typeSpec::SPEC_PUBLIC) != 0;
 
                 fprintf(fp,
-                        "int styleable %s_%s %d\n",
+                        "int styleable.%s_%s %d\n",
                         nclassName.string(),
                         String8(name).string(), (int)pos);
             }