am bd32a79e: am f721b398: Merge "Prevent cases of bogus action bar measurement." into honeycomb-mr2

* commit 'bd32a79ecb1109c71f80510c927f6dbc131ae563':
  Prevent cases of bogus action bar measurement.