]> git.saurik.com Git - android/aapt.git/commit
am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
authorXavier Ducrohet <xav@android.com>
Tue, 15 Jan 2013 22:50:37 +0000 (14:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jan 2013 22:50:37 +0000 (14:50 -0800)
commited8baa85e6f416caecee472376c6430cf8ca1eb5
tree812cdfee4f815aeaea227fd66c690ee7c01f19d5
parent925f28f9192b51f77f700332ce737fb301990b45
parentd6ecd33ad35cff96758b2d5adf553ebbb791d95a
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.