OSDN Git Service

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

Trivial merge