]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 040ee57 9c0366d)
am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
authorDianne Hackborn <hackbod@google.com>
Wed, 6 Jan 2010 21:46:50 +0000 (13:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Jan 2010 21:46:50 +0000 (13:46 -0800)
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp

* commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8':
  Fix issue #2357259: aapt tool prints "uses-configuation:"

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

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