tree f48591a6feb0e60c3da8400098fc9a961af48d9d
parent 9c4ed1394bb16b1d76758127a9b5d73bd363adaf
parent 5474902fe9fe72c825855c4a77f99a581a9f6594
author Dianne Hackborn <hackbod@google.com> 1275851405 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275851405 -0700

am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi