OSDN Git Service

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

Trivial merge