commit bbb5a5ce1922a168335811b177cd7341350c15cc
author Dianne Hackborn <hackbod@android.com> Sat Jan 29 14:38:48 2011 -0800
committer Android Code Review <code-review@android.com> Sat Jan 29 14:38:48 2011 -0800
tree abfdcd3321ec33081bf63095812cf42c7ec0319e
parent 9720323a5138acafbe30da38d61eeac469b675a4
parent 5ef0b9d72451d4bb65f5a76a05738041ed15664a

Merge "Make AaptGroupEntry::getMncName accept mnc00"

tools/aapt/AaptAssets.cpp

diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index e4f447e..2b2ec7b 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -685,13 +685,11 @@
     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;
 }
 
 /*