am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents...

author Dianne Hackborn <hackbod@google.com>

Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
author Dianne Hackborn <hackbod@google.com>
Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
diff --cc include/utils/ResourceTypes.h
Simple merge
diff --cc libs/utils/ResourceTypes.cpp
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)
		1	2
include/utils/ResourceTypes.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/utils/ResourceTypes.cpp	patch \|	diff1 \|	diff2 \|	blob \| history