OSDN Git Service

merge from tools_r12
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 23:32:04 +0000 (16:32 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 13 Jun 2011 23:32:04 +0000 (16:32 -0700)
Change-Id: I14130e9e2a1f58a8db762b3e2b9a1b249664fa4e


Trivial merge