OSDN Git Service

resolved conflicts for merge of 9f4d00b9 to master
authorYing Wang <wangying@google.com>
Tue, 5 Jun 2012 22:44:21 +0000 (15:44 -0700)
committerYing Wang <wangying@google.com>
Tue, 5 Jun 2012 22:44:21 +0000 (15:44 -0700)
commit130ae6adcb418d461b78d6667527137854f54592
treeea76d2183cec1af6556b107302fe99c868a472f9
parent3ec406191165b8e8711d0c4ce7211ea6d4d924dd
parent9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db
resolved conflicts for merge of 9f4d00b9 to master

Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
core/combo/HOST_darwin-x86.mk