tree 6065d8f96a2dfd88f0c356e9a469af7731acf3f5
parent 88dcd16a2a2151d8ad62e8ae48b9d1bdab9bb36d
parent 0a6dde72657ed1f95e81b7d769c77f457c73de62
author Sunny Goyal <sunnygoyal@google.com> 1472583334 +0000
committer android-build-merger <android-build-merger@google.com> 1472583334 +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
am: 0a6dde7265

Change-Id: I9a88426d472b117a300d2f543720b8e52b3e2ded