tree 3aa83d6a4588cfded1f555194289b5206d8d1633
parent 5fd230e19f8e6d6c04293556f9c601e049d28b5a
parent 54a90c3d1372389ed78e9bede8fd4a49e569ea4b
author Jason Sams <rjsams@android.com> 1255545283 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255545283 -0700

am 54a90c3d: am f4e25916: am dc7e8177: Merge change I0f505e57 into eclair

Merge commit '54a90c3d1372389ed78e9bede8fd4a49e569ea4b'

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