am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes