OSDN Git Service

resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 10 Mar 2011 01:02:35 +0000 (17:02 -0800)
committerYing Wang <wangying@google.com>
Thu, 10 Mar 2011 01:02:35 +0000 (17:02 -0800)
commitf8a7ff191af760ee01e5c31f154f0dbc7abfef7e
tree8f3105647568b60e193683184ffddb82e25fbeee
parent122b3d196beee18363309fef803389f5b8db7f40
parent123995f9e1c4318b6b7469754a9d19e5c66b34c5
resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
core/main.mk