OSDN Git Service

merge from tools_r8
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Oct 2010 22:32:15 +0000 (15:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Oct 2010 22:32:15 +0000 (15:32 -0700)
Change-Id: If3f0a5d9b487e23c8f28fc4db676b0cb70d09c5a


Trivial merge