am 12814547: resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp

Merge commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce'

* commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce':
  Fix 2209086: Add animations and misc ui improvements to SlidingTab.