OSDN Git Service

resolved conflicts for merge of 5836d3b3 to jb-mr1-dev
authorJoe Onorato <joeo@google.com>
Fri, 17 Aug 2012 07:09:27 +0000 (00:09 -0700)
committerJoe Onorato <joeo@google.com>
Fri, 17 Aug 2012 07:09:27 +0000 (00:09 -0700)
commitcea08a5220bb0b1169e227dd4a08dd94fef0720b
tree17011c2939f203735b5ab27c126e8a246a034282
parent36bec56c303ff250ba8c571c837531f82411839e
parent5836d3b3d99e99d3f18d5416a7e7c514bd1b97b6
resolved conflicts for merge of 5836d3b3 to jb-mr1-dev

Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
core/base_rules.mk
core/definitions.mk
core/envsetup.mk
core/main.mk
target/product/core.mk
target/product/generic_no_telephony.mk
target/product/mini.mk