tree 23f458f7b2bf07089e03934403762efdce4f4e3b
parent 5d56ce7c82fb4bee53f2454c1f1c37a17cb4deb4
parent 8180456e9c96c5cce606e48397928247a000837c
author Mathias Agopian <mathias@google.com> 1307470501 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307470501 -0700

am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)

* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)