OSDN Git Service

Merge "Override old alarms in zen schedule" into pi-dev
authorBeverly <beverlyt@google.com>
Wed, 20 Feb 2019 20:29:58 +0000 (12:29 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Feb 2019 20:29:58 +0000 (12:29 -0800)
commit0a9b851293c8b558f6c060fa80b1c9d54cf940b8
treefb61a746869cfa9fcc22e40968da6cda54f654ab
parent1eaff3f103c4aba07a8f2b29f6d88c1bc909a538
parent2ab75b2b2e8671f789acf95b8499e7ff3c2c2b89
Merge "Override old alarms in zen schedule" into pi-dev
am: 2ab75b2b2e

Change-Id: I8db691e85b738d2d7821de715e124c1e3ce3b913
services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java