]> git.saurik.com Git - android/aapt.git/commit
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)
commitd6ecd33ad35cff96758b2d5adf553ebbb791d95a
tree22381550da65936ff6680a4bf68a0437b338101b
parent218c8389d15ef0667eac8bc883f63eeb7133bdea
parentfaa8c413001bcdcb15188ab77b31584c944f2042
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.