am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action...
am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed0 automerge: 5ad07639
* commit 'a3698098':
Use the right layout for inflating Action Bar.