]> git.saurik.com Git - android/aapt.git/commit
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)
commit3152b91241261222e0589353966d328275abcce2
tree540e7a160770289ded9dbaec216d2b12c2f0f03c
parent6b12183e3626207313a23f6419af4126cf0cb9b4
parentbd8c05dde553c7da896332f1fae7b3c40da9951c
am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
AaptAssets.cpp