OSDN Git Service

resolved conflicts for merge of a6bed2f7 to gingerbread
authorYing Wang <wangying@google.com>
Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)
committerYing Wang <wangying@google.com>
Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)
commita9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13
treec4331554c53e7aa848167ead929215b067aa98f9
parent90b1d3dcfece8eef53277cbcf0326deda9f16f09
parenta6bed2f723cce6e684102890b4e6cb224412a1ce
resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
core/main.mk