tree 1a65a7000810c7e096452c5b9e2cafdacd5be65f
parent cdc0d941e8d34e63ef2f4b2eda6e040a7d902792
parent f4dc9da3724c20837e3a361060acd139775541ac
author Jean-Baptiste Queru <jbq@google.com> 1248962224 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248962224 -0700

am f4dc9da3: Merge snapshot variant of donut back into the main tree

Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'

* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
  donut snapshot