tree 5797ce3709bc320265cc9813cbf915f88d9c70d1
parent 67f1848563d3295d1cf3bdf669232542b7fd980c
parent 7f1489bc4b9a8b2382491e2c98c76fabb6808966
author Dianne Hackborn <hackbod@google.com> 1305329520 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305329520 -0700

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

* commit '71da32074ce729fe170de2d6c348b110fb6625cc':
  Fix a bug where an action bar could be created when it should not be.