OSDN Git Service

Merge 917d9ea1
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:22:52 +0000 (14:22 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:22:52 +0000 (14:22 -0800)
Change-Id: I7c92b0dbff44375b714e99b9cdc7052628db8ecb


Trivial merge