OSDN Git Service

merge from tools_r10
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 00:13:10 +0000 (16:13 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 00:13:10 +0000 (16:13 -0800)
Change-Id: I605434d1a2bbad5369c73c127c6d87b4b0c59b8a


Trivial merge