OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 01:09:01 +0000 (17:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jan 2011 01:09:01 +0000 (17:09 -0800)
commitb4e316be1fcc2d89d09c914ac42d6b7ca95a20b7
tree093e947bfaa3b37798efeca0393763e2ca712839
parentbe65dc7214a4aed555beb5e1350f5117feab00c7
parent1ed906fcd6d45cc06bd220ac777f329079cb786d
merge from tools_r9

Change-Id: Ic801ee7185efda5e0b7db12d3267726e8d2c8f53