OSDN Git Service

Merge commit '9a46327e' into ics-mr1-plus-aosp
authorEd Heyl <ed@google.com>
Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)
committerEd Heyl <ed@google.com>
Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)

Trivial merge