| commit | a043655e3a7c1aa326d50666198ea59aaec84731 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sun Mar 21 17:29:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Mar 21 17:29:33 2021 +0000 |
| tree | 1841ec62ec64c6b974b67fc8908066a082cc0fcc | |
| parent | 28a89348a90ab74c12f11e753d067da19635cfe2 [diff] | |
| parent | dd37a5d5765c378888f1511ce6f2a5e1515c5fa2 [diff] |
Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297 Change-Id: I5d547c23baf7798e09d9d9aad188f094ebfe4cfe