tree d5cebe2fa63c7c394dffd5651337d34596893963
parent 098d645a41bb68bb30ba198e76ed75493eb58a8a
parent d3f14a625e74a93e52b8b9aa5363a5de50129ea9
author Jean-Baptiste Queru <jbq@google.com> 1242845398 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242845398 -0700

am d3f14a62: reconcile donut snapshot

Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'

* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
  donut snapshot