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)
commitad8fe0c12b593fec209feefa337905653299ac06
tree54837ccde537f0878843295e7adfee349dfb17c3
parent88c73a6216223f96e6951097fc1d8d4f440093c6
parentf5ed39cd40956a03c42a1bc2a10c2d3ff36ac889
Reconcile with honeycomb-mr2-release

Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88