tree c7b1d7c8c18f5d74370558cbcf48ca6747661096
parent 71bb59f9e6799083830077dbb7e0f1effdd3faf7
parent a30063d80c08434ac3c7316f338c6d54110449ab
author Dianne Hackborn <hackbod@android.com> 1296371090 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296371090 -0800

am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d