tree 41dc8000bf3f7e24e03bc5dfbecac42f3dfead91
parent 59272eba29df3b2dc82343a2aa8f9ee3c32b71dc
parent 72dc60c5760166699effee7be17528de7f29fa67
author Hyunyoung Song <hyunyoungs@google.com> 1469828310 +0000
committer android-build-merger <android-build-merger@google.com> 1469828310 +0000

Merge \"Cancel exit spring loaded runnable when launcher state is set to APPS or WIDGETS b/29645452\" into ub-launcher3-calgary
am: 72dc60c576

Change-Id: Ida309677c84d067f012841aa9edeb21ec03594fe