OSDN Git Service

Merge "Merge ee5c6227 from master. DO NOT MERGE." into tools_r10
authorXavier Ducrohet <xav@android.com>
Wed, 9 Mar 2011 20:56:07 +0000 (12:56 -0800)
committerAndroid Code Review <code-review@android.com>
Wed, 9 Mar 2011 20:56:07 +0000 (12:56 -0800)
commit67b35db692b63bc04771dcbf643c87e5c649be90
treef404265346c4c6525caa17901bd32b568cce5d0d
parent9ce36a22440127a04567a47f6c04a546a073531e
parent60c18b064b6fecf5b157a38e1ecd8769b1ece4d0
Merge "Merge ee5c6227 from  DO NOT MERGE." into tools_r10