OSDN Git Service

merge from tools_r6
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 May 2010 14:24:20 +0000 (07:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 May 2010 14:24:20 +0000 (07:24 -0700)
Change-Id: I8a6773e95a8597a7cdb500e1775245c31530f75d


Trivial merge