OSDN Git Service

Reconcile with honeycomb-mr2-release
authorJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jun 2011 22:01:26 +0000 (15:01 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jun 2011 22:01:26 +0000 (15:01 -0700)
Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88


Trivial merge