OSDN Git Service

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

Trivial merge