OSDN Git Service

merge from tools_r7
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 20:05:56 +0000 (13:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 20:05:56 +0000 (13:05 -0700)
Change-Id: I1c48422d1732d53527d7afae6c30c285bee54146


Trivial merge