OSDN Git Service

Merge "Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not merge...
authorXavier Ducrohet <xav@android.com>
Fri, 18 Mar 2011 20:04:56 +0000 (13:04 -0700)
committerAndroid Code Review <code-review@android.com>
Fri, 18 Mar 2011 20:04:56 +0000 (13:04 -0700)

Trivial merge