OSDN Git Service

Merge "Merge 9d342967 from master to r12. do not merge." into tools_r12
authorXavier Ducrohet <xav@android.com>
Wed, 15 Jun 2011 01:02:52 +0000 (18:02 -0700)
committerAndroid Code Review <code-review@android.com>
Wed, 15 Jun 2011 01:02:52 +0000 (18:02 -0700)

Trivial merge