OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:51:20 +0000 (17:51 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:51:20 +0000 (17:51 -0800)
Change-Id: I4de6cfe4ca47f134813fd44f617103f8ac43822c


Trivial merge