| commit | 03f2900d0a0d1b524d3d7db8e60ad43d2d7de696 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Mar 22 12:27:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 12:27:31 2021 +0000 |
| tree | 3c373d6422ce92df77c2ee08e49341531636320f | |
| parent | b28d29738c4bd80bae2a1ed020bb2e6ab24a9ba4 [diff] | |
| parent | a043655e3a7c1aa326d50666198ea59aaec84731 [diff] |
[automerger skipped] Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 am: a043655e3a -s ours am skip reason: skip tag Change-Id Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 9d239b5515 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297 Change-Id: Ie24e96154851ddeac6971e4bfa49a0eb43e5915c