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)
commit402960177f9539e4e66623c82f0d123c9b4ba5a1
tree038ae147c547c5c135dafe2a8bcc6a38c8d3a6f2
parent50168d71e860def502bce7f284e4f7a4e7ccd637
parenta8eea2f3d98fb510803085635ba331e7026902b5
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