]> git.saurik.com Git - android/aapt.git/commitdiff
am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
authorDianne Hackborn <hackbod@android.com>
Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)
* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
  Normalize output from aapt d


Trivial merge