OSDN Git Service

resolved conflicts for merge of 9f28f0d7 to master
authorYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:19:11 +0000 (17:19 -0700)
committerYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:19:11 +0000 (17:19 -0700)
commit3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3
tree3b70edf561e50f5aae152a02857fedb7d34f261c
parent1613f4ff1ee432a01fcce70a9020f19929e7290a
parent9f28f0d76e31c9cce0aecb06091cf0e40b44fd0e
resolved conflicts for merge of 9f28f0d7 to master

Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
core/Makefile
core/base_rules.mk
core/clear_vars.mk
core/config.mk
core/main.mk
core/package.mk