am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"

* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc': Make AaptGroupEntry::getMncName accept mnc00
2011-01-29 14:59:02 -08:00
parent 87d197597c bbb5a5ce19
commit 2107757dde
1 changed files with 3 additions and 5 deletions
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -685,13 +685,11 @@ bool AaptGroupEntry::getMncName(const char* name,
    if (*c != 0) return false;
    if (c-val == 0 || c-val > 3) return false;

-    int d = atoi(val);
-    if (d != 0) {
-        if (out) out->mnc = d;
-        return true;
+    if (out) {
+        out->mnc = atoi(val);
    }

-    return false;
+    return true;
 }

 /*