tree aa05116548e444264e4814f09e6cf2ebd5fdc68f
parent 40f92fe967f36d524d173b7819dc875af2cd9971
parent 9ad091ab1065e85222da0927bb33913530f56f65
author Dianne Hackborn <hackbod@google.com> 1259104093 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259104093 -0800

am 9ad091ab: am 118d92f7: Merge change I16925b91 into eclair

Merge commit '9ad091ab1065e85222da0927bb33913530f56f65' into eclair-mr2-plus-aosp

* commit '9ad091ab1065e85222da0927bb33913530f56f65':
  Finish fixing issue #2228381: android.view.InflateException...