OSDN Git Service

merge from tools_r10
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 00:13:10 +0000 (16:13 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 00:13:10 +0000 (16:13 -0800)
commit97854f32e16b8f145169e985154b778af1cb052b
tree6a7204e311eb2e2bb971539ffa5eaa6a89523569
parente9818070d6bed4ba162fadef233592af2dc83b3d
parentcd11fab9d48875b13947f52b5bcb366a85bcf18d
merge from tools_r10

Change-Id: I605434d1a2bbad5369c73c127c6d87b4b0c59b8a