OSDN Git Service

Reconcile with honeycomb-mr2-release
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:37 +0000 (10:42 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Jun 2011 17:42:37 +0000 (10:42 -0700)
Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383


Trivial merge