am 9549824d: am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae

* commit '9549824d2b7363b69d9ccc529dabf0d608b1ab39':
  Support framework menus in ActionBar