OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 18:42:18 +0000 (11:42 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 18:42:18 +0000 (11:42 -0700)
commit5dab16ed3e5bb81fe48ed4115fe6c72e7b39c856
treeab5f8c7ebf5b198ad58f84dfcd887a405b85ca68
parentac66f755a3173aa93da4dc5c4a1332dddcc44d5d
parent1e9adf720237605516def4ef98922994fa74b01f
merge from tools_r12

Change-Id: Ib9d187b111a4e9cd69fc3db2b125e7cf021bd9a8