tree f19f7c96987a51b14e9f509b32a2c66aa15bd0e9
parent 562e04035bf327857a77d7b897e7e1ec5ec8ef3d
parent dbbb1fee90b9bbb6a9c271eb9739804cf7d8a6f3
author Sunny Goyal <sunnygoyal@google.com> 1472843933 +0000
committer android-build-merger <android-build-merger@google.com> 1472843933 +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
am: dbbb1fee90

Change-Id: If5d392fb037a57669407c16d428ef12cdd52377a