OSDN Git Service

resolved conflicts for merge of dc45f86a to master
authorYing Wang <wangying@google.com>
Mon, 27 Sep 2010 19:05:56 +0000 (12:05 -0700)
committerYing Wang <wangying@google.com>
Mon, 27 Sep 2010 19:05:56 +0000 (12:05 -0700)
commite874e23a3ce6a53170bdbc91b1baf6eb9c354f4e
tree665c442152698095beffb512b5dc22e10dddd0b3
parent5d40d86c6129ee15f4eacbe9987df94f0d3db53e
parentdc45f86af8d5c2cdc743bee8878fe005cf8222d8
resolved conflicts for merge of dc45f86a to master

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