OSDN Git Service

Merge "Merge 0b95acc1 from master to r12. do not merge." into tools_r12
authorXavier Ducrohet <xav@android.com>
Mon, 13 Jun 2011 18:31:14 +0000 (11:31 -0700)
committerAndroid Code Review <code-review@android.com>
Mon, 13 Jun 2011 18:31:14 +0000 (11:31 -0700)
commit1e9adf720237605516def4ef98922994fa74b01f
treeab5f8c7ebf5b198ad58f84dfcd887a405b85ca68
parentf03ec978e97330f1611bca3fe63b11279c07febd
parent8c3f16ae7d66cedf70c494de3a38a54e90f2a54e
Merge "Merge 0b95acc1 from master to r12. do not merge." into tools_r12