am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763

* commit 'a36980980886a645627542a7bcabf0d718ea79c9':
  Use the right layout for inflating Action Bar.