commit | 2c5b333737f6dd42ee5b1d07ad2264e121c3e428 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Mar 22 11:00:35 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 11:00:35 2021 +0000 |
tree | 3c373d6422ce92df77c2ee08e49341531636320f | |
parent | def33143e8deda841182d6ad8735bb0b93cd20f5 [diff] | |
parent | db1ad4da2b84c2d3c8d386ffeca2d115c01eccd3 [diff] |
[automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec am: db1ad4da2b -s ours am skip reason: skip tag Change-Id I99c0d28069dd1a13d452105b0a83a03a833232a2 with SHA-1 3b8af467a8 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644996 Change-Id: I97d82338363702be56963839a241e1d72c1e9c86