tree a21ad5689e0bdcd7589b00dc8499d484d34d4330
parent f89a603753771c9682f446f0e64e4674b01cd59b
parent 66dfd0129231e1b5822ad06a29b4109fd9a1d744
author Julia Reynolds <juliacr@google.com> 1524257089 -0700
committer android-build-merger <android-build-merger@google.com> 1524257089 -0700

Merge "GetActiveNotifications should never return null" into pi-dev
am: 66dfd01292

Change-Id: Iba293f70adda8e225d8b8c2f84465d95acbb18cf