OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 19:59:30 +0000 (11:59 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 19:59:30 +0000 (11:59 -0800)
Change-Id: Ieca541476bac7f479dec499f3cf23dd13f4f1124


Trivial merge