]> git.saurik.com Git - android/aapt.git/commitdiff
am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
authorFicus Kirkpatrick <ficus@android.com>
Fri, 13 Aug 2010 21:27:41 +0000 (14:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Aug 2010 21:27:41 +0000 (14:27 -0700)
Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp

* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
  Add --max-res-version flag to aapt.


Trivial merge