OSDN Git Service

resolved conflicts for merge of 2b8d2383 to gingerbread
authorYing Wang <wangying@google.com>
Tue, 15 Jun 2010 22:11:51 +0000 (15:11 -0700)
committerYing Wang <wangying@google.com>
Tue, 15 Jun 2010 22:11:51 +0000 (15:11 -0700)
commitc01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6
tree6b3021fcae21fed17f4fc85c4a28044d74d2999b
parent71affe70fd8f882c7c9cc7a5aca28e714241eb6e
parent2b8d2383043a2b16e53538f9ebf123bfffd27ba1
resolved conflicts for merge of 2b8d2383 to gingerbread

Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
core/main.mk
core/product_config.mk
target/product/AndroidProducts.mk