OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:14:21 +0000 (19:14 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Jan 2011 03:14:21 +0000 (19:14 -0800)
Change-Id: I68c6498ffe1dbcd78bef71b85046501a25cf5231


Trivial merge