OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 22:14:34 +0000 (14:14 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 22:14:34 +0000 (14:14 -0800)
commitc5f25a0712a127f1148fb96769ee517ecf6662b4
tree4e8a2bd7956d34a2867c1f37d3138562f5113b58
parent3d25b3424813a46bcd089bad5442d449c6fa2ddc
parentba47983385c28c5663fa3954408706b4d06208bd
merge from tools_r9

Change-Id: I7fbb367fb5db1b0ffdc7f0dbd41476576a3b4109