OSDN Git Service

resolved conflicts for merge of 3453d5f3 to master
authorYing Wang <wangying@google.com>
Sat, 25 Sep 2010 01:27:29 +0000 (18:27 -0700)
committerYing Wang <wangying@google.com>
Sat, 25 Sep 2010 01:27:29 +0000 (18:27 -0700)
commit509d28b2b3cb3eb4d8bbd36a365457cb7b14f658
tree263ae9bfc9d2fcf2335ea951e554bb9daa7fa934
parentafd9652f6de5e98520ff0bf11ee5596412907fdc
parent3453d5f3a22e7a293de9b8c6853f89e6411c8dd9
resolved conflicts for merge of 3453d5f3 to master

Change-Id: If23d2817b4d74d48632776923805c2141da82257
core/definitions.mk
core/java.mk