OSDN Git Service

Merge -s ours commit 'dcd4a64f66'
authorStephen Li <stephenli@google.com>
Fri, 15 Jan 2016 23:53:35 +0000 (15:53 -0800)
committerStephen Li <stephenli@google.com>
Fri, 15 Jan 2016 23:53:35 +0000 (15:53 -0800)

Trivial merge