tree fa39003f9127c243b686264b48d5d2671e2ce8ac
parent cbdc7e844a8dafbada50ca8bae9319b7bd7980f2
parent 6e435abfeb7256b5ea82ca37166acf36e3f98085
author Elliott Hughes <enh@google.com> 1429118153 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429118153 +0000

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

* commit '6e435abfeb7256b5ea82ca37166acf36e3f98085':
  Move the menu header out of the menu.