tree 6065d8f96a2dfd88f0c356e9a469af7731acf3f5
parent aa806a4f48a19058dafb03276125a1c26b864934
parent a2125e1d102034e1d638b5d1e973b5b77cfe1efd
author Sunny Goyal <sunnygoyal@google.com> 1472582868 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472582868 +0000

Merge "Bug fix in Alarm where it was not getting called correctly if the new timeout was set that was smaller than the previously set timeout" into ub-launcher3-calgary-polish