tree 0e2a06801b479d7159f350b8758972904019b4ec
parent d09c0126550d0dd558817a2d62e85151dfa94d7e
parent 2a1580ca7d24e4b5dbe815e831332d1dd1d3b392
author Hyunyoung Song <hyunyoungs@google.com> 1431733423 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431733423 +0000

am 2a1580ca: Merge "Transition from back to showing widget tray if shortcut/Widget configure activity was cancelled." into ub-launcher3-burnaby

* commit '2a1580ca7d24e4b5dbe815e831332d1dd1d3b392':
  Transition from back to showing widget tray if shortcut/Widget configure activity was cancelled.