tree 8bafeaf742b1705a3611b994f7da2af180ba2ea7
parent 312011094f0a00ba53fb5cc6e8d01d8ac90addf1
parent b790083b8f757e6d73b92460e6447acbf5490654
author Hyunyoung Song <hyunyoungs@google.com> 1431733005 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431733006 +0000

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