tree 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f
parent 6601c3a8ceb51f085d5f85c765232254065732ce
parent c08b653546509843a698da1393eb0bb1ea25a70d
author Scott Main <smain@google.com> 1288990661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288990661 -0700

am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread

* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8':
  fix xlarge support in aapt for gingerbread