OSDN Git Service

Merge "Merge 677a2489 from master. do not merge." into tools-adt_r11
authorXavier Ducrohet <xav@android.com>
Thu, 19 May 2011 21:19:55 +0000 (14:19 -0700)
committerAndroid Code Review <code-review@android.com>
Thu, 19 May 2011 21:19:55 +0000 (14:19 -0700)

Trivial merge