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)
commitbc3cab4ddb8b5360db83a0bf10d87b4557fa6a5d
treeae746ffc761977b58c59f3d5efa5cd611d3f83c5
parentb6502043a67a04919dce66e5638a6bacf315e94e
parent52d7eb75ad10af69f6eb89dc02abb373e943b8d8
Merge "Merge 580ecb7a from  do not merge." into tools-adt_r11