OSDN Git Service

Merge "Integrate 6db57208 into tools_r8. DO NOT MERGE." into tools_r8
authorXavier Ducrohet <xav@android.com>
Wed, 20 Oct 2010 20:24:06 +0000 (13:24 -0700)
committerAndroid Code Review <code-review@android.com>
Wed, 20 Oct 2010 20:24:06 +0000 (13:24 -0700)

Trivial merge