tree 205c449d087c7a1d4331eadcf45cdee7dbf4b048
parent 6824c135fe9639c74f38f125d678c20065c3347c
parent 6121f06ed5847d1edd22b23c3b28bf3b3e3af602
author Dianne Hackborn <hackbod@google.com> 1305329204 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305329204 -0700

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

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