am 963aebaf: Merge change 4646 into donut

Merge commit '963aebaffad1c4f6934940c32a6f16bf7babe7cb'

* commit '963aebaffad1c4f6934940c32a6f16bf7babe7cb':
  Force the id of TabWidget to be android:id/tabs