OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:22:50 +0000 (16:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 00:22:50 +0000 (16:22 -0800)
Change-Id: I2c7746cdb6b6df94186aebbc24240c5f457876d0


Trivial merge