OSDN Git Service

Merge "Merge a109773a from master. do not merge." into tools-adt_r11
authorXavier Ducrohet <xav@android.com>
Tue, 17 May 2011 18:45:38 +0000 (11:45 -0700)
committerAndroid Code Review <code-review@android.com>
Tue, 17 May 2011 18:45:38 +0000 (11:45 -0700)

Trivial merge