tree 5f7ba99e6646224a88cfaf7c268863e9e8a978df
parent f52e9f703305a03e76f59ad41094c5bc8636d31c
parent d3db17d8e8563c1629bc705ecded54a405d84b7e
author Jean-Baptiste Queru <jbq@google.com> 1251930910 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251930910 -0700

am d3db17d8: Merge snapshot version of donut back into the main tree

Merge commit 'd3db17d8e8563c1629bc705ecded54a405d84b7e' into eclair

* commit 'd3db17d8e8563c1629bc705ecded54a405d84b7e':
  donut snapshot