OSDN Git Service

Merge "Merge 580ecb7a from master. do not merge." into tools-adt_r11
authorXavier Ducrohet <xav@android.com>
Tue, 17 May 2011 17:47:34 +0000 (10:47 -0700)
committerAndroid Code Review <code-review@android.com>
Tue, 17 May 2011 17:47:34 +0000 (10:47 -0700)

Trivial merge