tree 03327f50b97f4dbd0235eb729d076cdb4c92b73a
parent e56f65cc2d1780a14b3b0ee0c63b08184c193449
parent 512837cef2b7203123d0b8df7ad49454ce932a75
author Jean-Baptiste Queru <jbq@google.com> 1243032193 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1243032193 -0700

Merge open-source donut back into internal tree

Merge commit '4cf03d381b2dff908857fceff0bec445f8d44f36' into HEAD