tree f19f7c96987a51b14e9f509b32a2c66aa15bd0e9
parent c646e1ad99cd15f7851bdded638b94c87ced6510
parent d82f688b9fd5649816a151bc8c9b7ccda06327ec
author Sunny Goyal <sunnygoyal@google.com> 1472844059 +0000
committer android-build-merger <android-build-merger@google.com> 1472844059 +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
am: d82f688b9f

Change-Id: Iff5261899f13d8023c722b100501dd0ebe0f3fcc