tree e69962db4096214605e427cb428fb09c284faca2
parent 6810ff10c0f611a9c13627eda838a6a2272904c9
parent a643f89ce1ed97e8e1f75af0233a92b7c5c9c878
author Julia Reynolds <juliacr@google.com> 1524257692 -0700
committer android-build-merger <android-build-merger@google.com> 1524257692 -0700

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

Change-Id: I6ab090f262e819babc334a9c1a41bc1cb4920c2e