OSDN Git Service

undo reset to ics-mr1 until we have a better method
authorEd Heyl <ed@google.com>
Wed, 26 Oct 2011 21:53:24 +0000 (21:53 +0000)
committerEd Heyl <ed@google.com>
Wed, 26 Oct 2011 21:53:24 +0000 (21:53 +0000)

Trivial merge