tree d83c48877ab9ffb6bdacf6cbb92ecedcd8ac9b7b
parent eb68a226563f60265663f1688dda77c4f909e5de
parent b882b361f123e4ef7870c99e8a9fd9e1be48e396
author Paul Westbrook <pwestbro@google.com> 1260402942 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260402942 -0800

am b882b361: Merge change Iee7f2457 into eclair-mr2

Merge commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396' into eclair-mr2-plus-aosp

* commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396':
  Deleted Gmail.java from frameworks.  Previously it had been moved to vendor/google/.../Gmail/...