OSDN Git Service

resolved conflicts for merge of 70555a16 to master
authorYing Wang <wangying@google.com>
Tue, 15 Apr 2014 20:55:24 +0000 (13:55 -0700)
committerYing Wang <wangying@google.com>
Tue, 15 Apr 2014 20:55:24 +0000 (13:55 -0700)
commit51f0d3f58a5c04ee328778bc97e42dc10cfa41ad
treee117392f7399a5e9999ce468475e9644795cf70d
parenta1f8afa930ccaa0241892f25d37325743661755a
parent70555a1677100326b7cf6d503681e0ef52c82154
resolved conflicts for merge of 70555a16 to master

Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
core/Makefile
core/main.mk