]> git.saurik.com Git - android/aapt.git/commitdiff
am 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
authorFicus Kirkpatrick <ficus@android.com>
Mon, 16 Aug 2010 14:49:30 +0000 (07:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Aug 2010 14:49:30 +0000 (07:49 -0700)
Merge commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4'

* commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4':
  Add --max-res-version flag to aapt.


Trivial merge