OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 20:58:38 +0000 (13:58 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 20:58:38 +0000 (13:58 -0700)
commitdce68be01e3b9f330c4f9ea5660cdc20948ed382
tree4088d4d2bde60d07c757c9f0b168e14941d98e47
parent5dab16ed3e5bb81fe48ed4115fe6c72e7b39c856
parent51e6cdf86ae4f1c53fb112ed7fcb9d683cf1cd8c
merge from tools_r12

Change-Id: Ic2616b4dccc395eaa8e224c2fa12cbce6fd2f770