OSDN Git Service

resolved conflicts for merge of f83fd362 to master
authorYing Wang <wangying@google.com>
Wed, 9 Jun 2010 18:48:48 +0000 (11:48 -0700)
committerYing Wang <wangying@google.com>
Wed, 9 Jun 2010 18:48:48 +0000 (11:48 -0700)
commit9a5418bba5440c915cbb44752982b80225d83cd5
tree5140110b25ae4fa1c629baa1d5eede8659a22032
parenta4db49fc576f717abe6da472cdf037ca209eaa20
parentf83fd362a974c79daedd3d672dfda9820a5d1b97
resolved conflicts for merge of f83fd362 to master

Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80
core/base_rules.mk
core/config.mk