OSDN Git Service

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


Trivial merge