OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jan 2011 23:32:39 +0000 (15:32 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jan 2011 23:32:39 +0000 (15:32 -0800)
Change-Id: I50ef4a713e7c131155a875dc60c6dc2c7ea1b770


Trivial merge