OSDN Git Service

Merge "Integrate 32c960c6 in tools_R10 -- DO NOT MERGE." into tools_r10
authorXavier Ducrohet <xav@android.com>
Thu, 10 Feb 2011 02:27:34 +0000 (18:27 -0800)
committerAndroid Code Review <code-review@android.com>
Thu, 10 Feb 2011 02:27:34 +0000 (18:27 -0800)

Trivial merge