tree ec9316c9fbf2ec17d382f2315ef52d03dc20313d
parent 5fa65082f16741394dcfbe756e3880d5c018dace
parent 149427cd903f2100e3cc39bda41b831cd68bc553
author Dianne Hackborn <hackbod@google.com> 1272057819 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1272057819 -0700

Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo