OSDN Git Service

resolved conflicts for merge of f966bda4 to master
authorYing Wang <wangying@google.com>
Tue, 1 Apr 2014 01:17:22 +0000 (18:17 -0700)
committerYing Wang <wangying@google.com>
Tue, 1 Apr 2014 01:17:22 +0000 (18:17 -0700)
commit710e0265bc5f70398e7c070941ae6af34bf5c5d5
treec8bad10a15f4c15a344e3cc7902b7180c6e26ec6
parent707354c0ad06fbca6154b69d6453577df61611db
parentf966bda49f4fdf749c91b30e9819c85ca9dab063
resolved conflicts for merge of f966bda4 to master

Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322
core/main.mk