tree 3c7a25b99212aa6093fc046a75500e3424bdc0cc
parent 29ef19c51482f862e1c3a803ddcac4a6984265cd
parent 2cf3cb08c88174b3986e59ae93eee34cc331e9d8
author Ian Kasprzak <iankaz@google.com> 1549582858 -0800
committer android-build-merger <android-build-merger@google.com> 1549582858 -0800

Merge "Mark DismissTimerTest#testAll and SetAlarmTest#testAll as Suppress." am: 3a90adbb23
am: 2cf3cb08c8

Change-Id: I6754753da6e06c991d58ea98922fd98450f99962