tree fc13e8547ac0f13cf2f3c220b738a23033bbf32b
parent 94787a73363a3fea461443389a6cbb05858923e0
parent 3f52b1961f7a7185b204cacba836b8feb1215468
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