From: Xavier Ducrohet <xav@android.com>
Date: Tue, 15 Jan 2013 22:50:37 +0000 (-0800)
Subject: am a4e10cc7: 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/ed8baa85e6f416caecee472376c6430cf8ca1eb5

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

* commit 'a4e10cc746caea514216f436e2065b3bbefb25ef':
  Fix the single crunch command to return the right error code.
---

ed8baa85e6f416caecee472376c6430cf8ca1eb5