]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 604ed8f 1eb15b5)
am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2
authorJean-Baptiste Queru <jbq@google.com>
Fri, 11 Dec 2009 01:57:04 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:57:04 +0000 (17:57 -0800)
Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt

1  2 
Command.cpp patch | diff1 | diff2 | blob | history

diff --cc Command.cpp
Simple merge
mirror of aapt