OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:05:03 +0000 (17:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 01:05:03 +0000 (17:05 -0800)
commit2f28c84a511cc855a1b775feec0c1c199b3ea430
tree1abde6271f06bee25fae7b01b46e1bbbb14369e8
parent13261dd9f2cdd45eb6b309ee3ea5a7a53d640999
parentd243bf10bb4ce1acb7153411dacd4f317b675414
merge from tools_r9

Change-Id: I515ff107ebd8bcc34945befc123e637f86f6dec9