am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."

author Raphael Moll <ralf@android.com>

Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)

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

Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)
author Raphael Moll <ralf@android.com>
Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)
diff --cc AaptAssets.cpp
Simple merge
diff --cc AaptAssets.h
Simple merge
author	Raphael Moll <ralf@android.com>
	Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)
		1	2
AaptAssets.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
AaptAssets.h	patch \|	diff1 \|	diff2 \|	blob \| history