]> git.saurik.com Git - android/aapt.git/commitdiff
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)
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi

1  2 
AaptAssets.cpp

diff --cc AaptAssets.cpp
Simple merge