am 90177e59: (-s ours) am d40575eb: am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2

* commit '90177e59e5211dd9ab33761ce800e8a86a49d1e2':
  DO NOT MERGE Action bar config changes