tree a45125698b41fc4b74cf047391c20e53c45353bf
parent a6a9b86b7a79fbb0ab5b24a9c480f4f859b47823
parent ced21e4e651ab86d311212f527036253dd8079c4
author Adam Powell <adamp@google.com> 1412182903 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412182903 +0000

am ced21e4e: am c754382b: am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev

* commit 'ced21e4e651ab86d311212f527036253dd8079c4':
  Inset the non-overlay contextual action bar without a status guard