From: Xavier Ducrohet <xav@android.com>
Date: Tue, 15 Jan 2013 22:48:02 +0000 (-0800)
Subject: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/d6ecd33ad35cff96758b2d5adf553ebbb791d95a?hp=faa8c413001bcdcb15188ab77b31584c944f2042

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 77168f9..9c2e1b9 100644
--- 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);
             }