]> git.saurik.com Git - android/aapt.git/commit
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)
commit6847fbceadc542f882adec4b3a04b760d204a179
treee8538346cc6add8613ffacda54e9774766282204
parent604ed8f9f41f26df9f70889b874088c4cea5d36e
parent1eb15b505ba1d7ea5a18363c4b7b137f2e9f6d01
am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

Merge commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453' into eclair-mr2-plus-aosp

* commit 'a5a8cc13d3f906650a1eb17e20e1b26d68b78453':
  Add --custom-package to aapt
Command.cpp