tree ff1b91cffa071f7b3c1dafd628416052a1da1317
parent 2a54c185a64b247ff261de962e3a4e0ddf4c2ff0
parent 2987c218e351c76941f09bddb3eb46a572ca6644
author Adam Powell <adamp@google.com> 1365099024 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365099024 -0700

am 2987c218: am 728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev

* commit '2987c218e351c76941f09bddb3eb46a572ca6644':
  Uphold common ordering expectations around action bar Home/Up dispatch