OSDN Git Service

Merge commit '2136801bbd32f5e9554aa8009d0e5f862744162b' into HEAD
authorBill Yi <byi@google.com>
Tue, 29 Apr 2014 18:34:10 +0000 (11:34 -0700)
committerBill Yi <byi@google.com>
Tue, 29 Apr 2014 18:34:10 +0000 (11:34 -0700)

Trivial merge