projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 925f28f d6ecd33)
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)
* commit 'a4e10cc746caea514216f436e2065b3bbefb25ef':
  Fix the single crunch command to return the right error code.


Trivial merge
mirror of aapt