tree 8b95d3f7dd34ef5493e611dd66100ba3f2dba2a3
parent ec4c5193689c30064d87a5febfde7c300b439f6c
parent 371de9695508073fbbde8181eb230e99cb045206
author Dianne Hackborn <hackbod@android.com> 1296371433 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296371433 -0800

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

* commit '371de9695508073fbbde8181eb230e99cb045206':
  Normalize output from aapt d