tree 54837ccde537f0878843295e7adfee349dfb17c3
parent 88c73a6216223f96e6951097fc1d8d4f440093c6
parent f5ed39cd40956a03c42a1bc2a10c2d3ff36ac889
author Jean-Baptiste Queru <jbq@google.com> 1307656886 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1307656886 -0700

Reconcile with honeycomb-mr2-release

Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88