Merge change If2b0bbed into eclair

* changes:
  Debugging for issue #2228381 android.view.InflateException