am 516035f0: am fb0784da: Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1

* commit '516035f0923aad612932327546e780c7c241ceda':
  Fix bug 5521467 - Monkeys and ActionBar custom tab views