OSDN Git Service

Merge c1efb060
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 20:09:58 +0000 (13:09 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 20:10:06 +0000 (13:10 -0700)
commit45a3ad7d225495367a47440da118609b4940fe71
tree348b50b97632fd4dc0f46b57903582eb16d9d8f1
parent60d6ef91b6e1f7803fdf7869afba01cdf37f1b17
parentc1efb06045132bc620e71be120a0ca71d81b35d5
Merge c1efb060

Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
core/config.mk
core/main.mk