OSDN Git Service

merge from tools_r7
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jul 2010 00:26:42 +0000 (17:26 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jul 2010 00:26:42 +0000 (17:26 -0700)
Change-Id: I2fb70c442aa1ec41ac23c8f0842e0e8e66c21f13


Trivial merge