tree a863d8527493efc08d596f31fdde23f7f05cc50a
parent d80ea6157e391d69a5c2956ae34781081dd3c0e8
parent 26646340d861a4c182e741be1ec677040dc7e979
author Joe Onorato <joeo@android.com> 1253901236 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253901236 -0700

am 26646340: Rollo tweaks.

Merge commit '26646340d861a4c182e741be1ec677040dc7e979'

* commit '26646340d861a4c182e741be1ec677040dc7e979':
  Rollo tweaks.