Merge "Collect the GPL source files."

author Ying Wang <wangying@google.com>

Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)

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

Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)
author Ying Wang <wangying@google.com>
Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)
diff --cc core/base_rules.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Ying Wang <wangying@google.com>
	Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)
		1	2
core/base_rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history