OSDN Git Service

Merge commit '9b3be84c' into manualmerge
authorYing Wang <wangying@google.com>
Fri, 24 Jan 2014 22:16:49 +0000 (14:16 -0800)
committerYing Wang <wangying@google.com>
Fri, 24 Jan 2014 22:16:49 +0000 (14:16 -0800)

Trivial merge