OSDN Git Service

Merge commit '24181ab' into merge2
authorEtan Cohen <etancohen@google.com>
Fri, 24 Apr 2015 21:34:24 +0000 (14:34 -0700)
committerEtan Cohen <etancohen@google.com>
Fri, 24 Apr 2015 21:34:24 +0000 (14:34 -0700)

Trivial merge