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.