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...