OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 23:35:06 +0000 (15:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 16 Jan 2011 23:35:06 +0000 (15:35 -0800)
commite8f078a7d240caf687a62cc200bdda339d70f814
tree794c2b1a250db298f8effc8d0b8ca2d94019da6d
parentc3a9198ef3e08505942bf3f5e727577498342265
parent56ed9048f65406ef950b28cad43a18945e39f590
merge from tools_r9

Change-Id: If115141a263671ae9073c207b85d22c5d68c2db9