OSDN Git Service

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

Trivial merge