tree 7cb58b77fc39b44b6cd7f29dd3fc55bde37dbd77
parent 411f6477c6e64ddda81a9ffc1f0315f921ea454c
parent 1914eecf5cde9a929547b834d3fca00b1239b3b9
author Lorenzo Colitti <lorenzo@google.com> 1616410835 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616410835 +0000

[automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 6d5c278d15 am: 1914eecf5c am: 4b623b3194 -s ours

am skip reason: skip tag Change-Id I99c0d28069dd1a13d452105b0a83a03a833232a2 with SHA-1 cd2bf4959f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644996

Change-Id: I97d82338363702be56963839a241e1d72c1e9c86