tree 413fbacaf9f89d8bd4dbd66326ec89b5090a376c
parent c6b32054c67901b0627ad99e4bd8b15c5cc2fb90
parent e7d3ee9d81de13e992c7d063ca472d480956b0c6
author Mathias Agopian <mathias@google.com> 1308272996 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308272996 -0700

am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)

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