OSDN Git Service

Merge remote branch 'goog/ics-mr0' into ics-mr1
authorEd Heyl <ed@google.com>
Tue, 25 Oct 2011 19:50:40 +0000 (19:50 +0000)
committerEd Heyl <ed@google.com>
Tue, 25 Oct 2011 19:50:40 +0000 (19:50 +0000)

Trivial merge