OSDN Git Service

resolved conflicts for merge of 67e0c2a6 to master
authorYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:45:35 +0000 (17:45 -0700)
committerYing Wang <wangying@google.com>
Thu, 23 Sep 2010 00:45:35 +0000 (17:45 -0700)
commit31a957076bc0e9e031462d765ca3eb4bf3607d73
tree82729b857400b9bd569af3c640f7e3ab0a99f986
parent3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3
parent67e0c2a6bdcc72026a7c3e7263ce2cbe48d18215
resolved conflicts for merge of 67e0c2a6 to master

Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
core/config.mk