tree de8a38f2143ab1fcaf7c94d609fdfa55c2b022a7
parent f4b981eb46b82b5d976799f68e9c3a10de54c8ed
parent c60c7a1a4a381d6f6d257516c063b985766398c4
author Treehugger Robot <treehugger-gerrit@google.com> 1620313666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620313666 +0000

Merge "Cancel NotificationTimeout alarms when canceling notification" am: 9e7ac57a6c am: c60c7a1a4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695745

Change-Id: I4cff81ddbbfb6d5b250ed210399ef72619daf8e1