OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:05:03 +0000 (17:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:05:03 +0000 (17:05 -0800)
Change-Id: I515ff107ebd8bcc34945befc123e637f86f6dec9


Trivial merge