OSDN Git Service

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)
commit371de9695508073fbbde8181eb230e99cb045206
tree8b725299fe6b9638dad8cc3dc538a23ae86377ac
parentbda99568d84530c6442af0602e9c12e6cb897780
parenta1f5e82f37c77af7b1d630b5bca715d1742f1234
am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
  Normalize output from aapt d
include/utils/ResourceTypes.h
libs/utils/ResourceTypes.cpp