tree 2316615a836500c1e7b629b83cdef86f5ee3cc23
parent ad5aeb88a4954cedc00e66ec51e47a252942a2f7
parent aba26a8ba4abc1645d2131ea2d8a0434364b4f80
author Dianne Hackborn <hackbod@google.com> 1272058581 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272058581 -0700

am 8aed789f: am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo