OSDN Git Service

merge from tools_r7
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Aug 2010 17:51:08 +0000 (10:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Aug 2010 17:51:08 +0000 (10:51 -0700)
Change-Id: I0a73800c5f6454a012d6556668aa98ddfb53db3a


Trivial merge