tree 9d78796a81d12944a808f4889a6202174ca37714
parent 6a49bff5694439b3f892cfcfd90b814884f8d44f
parent 1a58d9c398b7c584fed50f922a638f76bf0c94a0
author Eric Laurent <elaurent@google.com> 1288106088 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288106088 -0700

am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread