OSDN Git Service

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


Trivial merge