]> git.saurik.com Git - android/aapt.git/commitdiff
am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package...
authorDianne Hackborn <hackbod@google.com>
Fri, 3 Sep 2010 00:59:51 +0000 (17:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Sep 2010 00:59:51 +0000 (17:59 -0700)
Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7'

* commit '31103928ed5b9091bcd7de74c8a49675d10c87e7':
  Implement #2964234: Add support for <uses-package> element to aapt

1  2 
Command.cpp

diff --cc Command.cpp
Simple merge