OSDN Git Service

resolved conflicts for merge of 554402f7 to master
authorYing Wang <wangying@google.com>
Wed, 22 Sep 2010 21:11:49 +0000 (14:11 -0700)
committerYing Wang <wangying@google.com>
Wed, 22 Sep 2010 21:11:49 +0000 (14:11 -0700)
commit1613f4ff1ee432a01fcce70a9020f19929e7290a
treec55bc9fa1f4e48a013113de13cbc69e118c47e02
parentfed45d859aaecd8b34fb65eeaad678e1a1c71aa9
parent554402f76d8720dc3784b133d95f4aba2da4aa91
resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
core/config.mk
core/find-jdk-tools-jar.sh
core/main.mk