]> git.saurik.com Git - android/aapt.git/commitdiff
am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
authorXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)
* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
  Fix the single crunch command to return the right error code.


Trivial merge