OSDN Git Service

Merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:55:02 +0000 (07:55 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Dec 2010 15:55:06 +0000 (07:55 -0800)
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39


Trivial merge