OSDN Git Service

Merge "Integrate b283eb12 into tools_r9." into tools_r9
authorXavier Ducrohet <xav@android.com>
Fri, 10 Dec 2010 20:21:19 +0000 (12:21 -0800)
committerAndroid Code Review <code-review@android.com>
Fri, 10 Dec 2010 20:21:19 +0000 (12:21 -0800)

Trivial merge