OSDN Git Service

resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
authorColin Cross <ccross@android.com>
Wed, 12 Feb 2014 21:06:30 +0000 (13:06 -0800)
committerColin Cross <ccross@android.com>
Wed, 12 Feb 2014 21:09:29 +0000 (13:09 -0800)
commit2c32144b328e0191fa32bf342dc7eb01d6174b6e
treec59140890b7157f571306c2169ad53c2e62a9932
parent0b7197a612459caf2cdac8b9f0c0b8c5365b7837
parent7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239
resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp

Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
core/Makefile
core/clear_vars.mk
core/definitions.mk
core/package_internal.mk
core/tasks/vendor_module_check.mk