OSDN Git Service

merge from tools_r9
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jan 2011 23:32:39 +0000 (15:32 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Jan 2011 23:32:39 +0000 (15:32 -0800)
commit13261dd9f2cdd45eb6b309ee3ea5a7a53d640999
treecb26071badd47e67b5fca1808f2dd62ae5102ff0
parentcaffab631a603709ec18d379b876308f4e2afa50
parent30954bf2d5fac5345912e8345399399e34bfe31a
merge from tools_r9

Change-Id: I50ef4a713e7c131155a875dc60c6dc2c7ea1b770