OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Jan 2011 01:20:08 +0000 (17:20 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Jan 2011 01:20:08 +0000 (17:20 -0800)
Change-Id: If3a75250300bcc2de62ee0f20e40ff034ab18128


Trivial merge