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

Merge commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df'

* commit '80d5fc0f5add0c42e617ea6f4318b8a2b61370df':
  Finish fixing issue #2228381: android.view.InflateException...