OSDN Git Service

resolved conflicts for merge of 1a08100f to gingerbread
authorYing Wang <wangying@google.com>
Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)
committerYing Wang <wangying@google.com>
Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)
commitf0f60cdd8f4f74b2480774887606afdebec8d891
tree0abeae18b25ab87509ce6ac683fbcd83b6b09d25
parent0d205521ae4e8907bcc80774260a68c923970eca
parent1a08100fa9d92c25de32ba4d13fd3958bbcab894
resolved conflicts for merge of 1a08100f to gingerbread

Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
core/clear_vars.mk
core/combo/TARGET_linux-arm.mk
core/config.mk
core/definitions.mk