tree 48c61668391450c0273f448c82b78a48c03c0212
parent 62d59ed785b5a878721a773b7fb4bd1c7672f240
parent 8746aeb424ad42c640367ba8ac2674a0af1efb9c
author Ficus Kirkpatrick <ficus@android.com> 1281970170 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281970170 -0700

am 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread

Merge commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4'

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