OSDN Git Service

am 5474902f: Merge "xhdpi" into froyo
authorDianne Hackborn <hackbod@google.com>
Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)
commit168585ed68f03ddc851cd734cbb6ba813e30eb85
treef48591a6feb0e60c3da8400098fc9a961af48d9d
parent9c4ed1394bb16b1d76758127a9b5d73bd363adaf
parent5474902fe9fe72c825855c4a77f99a581a9f6594
am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
tools/aapt/AaptAssets.cpp