OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 18:28:02 +0000 (11:28 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 18:28:02 +0000 (11:28 -0700)
commitac66f755a3173aa93da4dc5c4a1332dddcc44d5d
treeab5f8c7ebf5b198ad58f84dfcd887a405b85ca68
parentdf59086558134aa0d98c59986b7866a3ea816e25
parentf03ec978e97330f1611bca3fe63b11279c07febd
merge from tools_r12

Change-Id: Ibac37d5ac8a7cea21828865a6681ec2ccf43450c