tree f3de50ed217f42652b8b75c1a7a3b223058639de
parent 4fb747f329523d6b3a7efc59a4360a249cdaa5ad
parent fb0784da5f602bf6410ef914d625c3cedfa11e9f
author Adam Powell <adamp@google.com> 1321925780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321925780 -0800

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

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