| commit | 84e5ff14e617fb302099773e05ee30d9d7666bd1 | [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 | 7cb58b77fc39b44b6cd7f29dd3fc55bde37dbd77 | |
| parent | 962f78e3fee203ff1e670967d9618d28f77ea041 [diff] | |
| parent | 2752f7f4b19b0ac46eacbdf3f7372719cfa1a6c0 [diff] |
[automerger skipped] Merge changes from topic "backport-connectivityresources" am: 2cff13b0fc am: 2752f7f4b1 am: cec8be5ba4 -s ours am skip reason: skip tag Change-Id Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 a338d5aa58 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297 Change-Id: Ie24e96154851ddeac6971e4bfa49a0eb43e5915c