tree 908619748432bc262712f2534031a21e92df013b
parent 706e8792eb2aaa2dd044d83e8ef11be2d4894ab4
parent 72b4976c6675f9ff5769420ee5a7dd7f8404e182
author Treehugger Robot <treehugger-gerrit@google.com> 1599790798 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599790798 +0000

Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 am: 72b4976c66

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

Change-Id: I30c8857054d78d1b0234797ff67cc477311bcc73