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

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.
---

d6ecd33ad35cff96758b2d5adf553ebbb791d95a