OSDN Git Service

Merge "Integrate c0336756 from master." into tools_r9
authorXavier Ducrohet <xav@android.com>
Wed, 15 Dec 2010 23:09:29 +0000 (15:09 -0800)
committerAndroid Code Review <code-review@android.com>
Wed, 15 Dec 2010 23:09:29 +0000 (15:09 -0800)

Trivial merge