OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 21:53:22 +0000 (13:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jan 2011 21:53:22 +0000 (13:53 -0800)
commit2cf77ed94246dec5548e6d864eeecd5e2eebb0ea
treec54dbfd54541419314daf59daeeede0d986aafca
parentfe85a20cb3cf88992e5cc2623c7f153936094e5d
parent2738abb9d7ddde6b87e7b91ab2eb2a10bd866f33
merge from tools_r9

Change-Id: Ie7d415905f23688bc4ae55f0095ff637c7a31e60