Merge "Automatically add Java resources carried by static Java libraries."

author Ying Wang <wangying@google.com>

Mon, 13 Aug 2012 15:46:02 +0000 (08:46 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 13 Aug 2012 15:46:03 +0000 (08:46 -0700)
author Ying Wang <wangying@google.com>
Mon, 13 Aug 2012 15:46:02 +0000 (08:46 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 13 Aug 2012 15:46:03 +0000 (08:46 -0700)
diff --cc core/definitions.mk
Simple merge
diff --cc core/package.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Mon, 13 Aug 2012 15:46:02 +0000 (08:46 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 13 Aug 2012 15:46:03 +0000 (08:46 -0700)
		1	2
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package.mk	patch \|	diff1 \|	diff2 \|	blob \| history