commit e8ffa1490023eff03335b550c582eaadd3a4561b
author Ying Wang <wangying@google.com> Wed Jun 02 14:37:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 02 14:37:28 2010 -0700
tree d68b4fde534f433a28ed4c02140eea7fc419e127
parent b93e03cbc9d47a9d9a385c780ed64639e2a23ae5
parent ba16a89dbd61003a3b907d0f5e8fc48fba2afcab

am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.

Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp

* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
  Override LOCAL_CERTIFICATE in inherit-package.

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 8b398fa..c678f97 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1749,7 +1749,7 @@
 # clear_vars.mk.
 ###########################################################
 define inherit-package
-  $(eval $(call inherit-package-internal,$(1),$(2),$(3),$(4),$(5)))
+  $(eval $(call inherit-package-internal,$(1),$(2),$(3),$(4),$(5),$(6)))
 endef
 
 define inherit-package-internal