am a8eaaa10: Merge change If90ee7e2 into eclair-mr2

Merge commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0' into eclair-mr2-plus-aosp

* commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0':
  Fix TabHost NPE when there are no tabs