tree fa39003f9127c243b686264b48d5d2671e2ce8ac
parent a5446f5b982522561636f583c42b0e3fcd7e548c
parent 98bfb6f797220818a4018ef5f3aa65fc074c8fc4
author Elliott Hughes <enh@google.com> 1429120166 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429120166 +0000

am 98bfb6f7: am 6e435abf: Merge "Move the menu header out of the menu."

* commit '98bfb6f797220818a4018ef5f3aa65fc074c8fc4':
  Move the menu header out of the menu.