tree 2e9de42bdbe3a26fc5b2a29bc2852cd0fe1dc6c7
parent ebc7ab5c42240d8cfbb34245d7e996091c480aaa
parent 935dc32e4a9302e9c121cd0a18b00f0e565c2bef
author Tyler Gunn <tgunn@google.com> 1420768871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420768871 +0000

am 935dc32e: am 97d15c72: Merge "Fixing overlap pane offset when shortcut card disappears." into lmp-mr1-dev

* commit '935dc32e4a9302e9c121cd0a18b00f0e565c2bef':
  Fixing overlap pane offset when shortcut card disappears.