tree e20d1cf17c727d8bbdaaeda0099c641d89313d9b
parent 093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239
parent 3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa
author Simon Wilson <simonwilson@google.com> 1299118429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299118429 -0800

am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread

* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
  Attempt to reduce problems from issue #3183612