OSDN Git Service

resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master
authorAndrew Hsieh <andrewhsieh@google.com>
Mon, 12 Nov 2012 20:50:03 +0000 (12:50 -0800)
committerAndrew Hsieh <andrewhsieh@google.com>
Mon, 12 Nov 2012 20:50:03 +0000 (12:50 -0800)
commitabfb25226aabdbda7f8900e923754beb7f8cb94d
treea64f5a7afef2bbfca702b37f96f2ce26c52a1142
parentbc4bcf4ad0d4be53235e949098b7cbd45b30b8c8
parent8b3ce5a3c7e8dc9a13d2ca69687aaff3cb7e4458
resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master

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