Merge "Add removed.txt for doclava api consistency check"

author Hui Shu <hush@google.com>

Thu, 13 Mar 2014 22:11:22 +0000 (22:11 +0000)

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

Thu, 13 Mar 2014 22:11:23 +0000 (22:11 +0000)
author Hui Shu <hush@google.com>
Thu, 13 Mar 2014 22:11:22 +0000 (22:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 13 Mar 2014 22:11:23 +0000 (22:11 +0000)
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Hui Shu <hush@google.com>
	Thu, 13 Mar 2014 22:11:22 +0000 (22:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 13 Mar 2014 22:11:23 +0000 (22:11 +0000)
		1	2
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history