am 7d87c37b: am 6121f06e: Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2

* commit '7d87c37b031616259d1db6a78ecb1ff20ee5ff5c':
  Fix a bug where an action bar could be created when it should not be.
This commit is contained in:
Dianne Hackborn 2011-05-13 16:29:40 -07:00 committed by Android Git Automerger
commit 7f1489bc4b

Diff Content Not Available