[automerger skipped] Merge "Remove NotifEntryManager" into tm-qpr-dev am: 9e53673684 am: 3e54503b06 -s ours
am skip reason: Merged-In I3e418dfd7d3512ac811e67733e32818622a0a415 with SHA-1 d4f52ca282 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19735662
Change-Id: Ie16c45c291bc4ad7d63b54b9325337d11b01d5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: