am 095dbffd: am 5d4808db: put extra recovery keys in the product definition

author Doug Zongker <dougz@android.com>

Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)

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

Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)
author Doug Zongker <dougz@android.com>
Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)
diff --cc core/product.mk
Simple merge
diff --cc core/product_config.mk
Simple merge
author	Doug Zongker <dougz@android.com>
	Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 16 Mar 2011 19:35:26 +0000 (12:35 -0700)
		1	2
core/product.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/product_config.mk	patch \|	diff1 \|	diff2 \|	blob \| history