tree 3aa83d6a4588cfded1f555194289b5206d8d1633
parent 16d76289e1c6fb0180a9ada24c9e4c2731c64a3e
parent dc7e8177b1cd0d7e82486b2083265bac2dcbd78b
author Jason Sams <rjsams@android.com> 1255480201 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255480201 -0700

am dc7e8177: Merge change I0f505e57 into eclair

Merge commit 'dc7e8177b1cd0d7e82486b2083265bac2dcbd78b' into eclair-mr2

* commit 'dc7e8177b1cd0d7e82486b2083265bac2dcbd78b':
  Checkpoint new rollo scripts.  Not currently in use.