commit | 20754ee85cc41466141344b73ed3fe6f2260d6b9 | [log] [tgz] |
---|---|---|
author | Serik Beketayev <serikb@google.com> | Fri Dec 25 09:58:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 25 09:58:40 2020 +0000 |
tree | 82dfd5d2e9079282344491870d584d3afac0438a | |
parent | 4f9da57398e473067f2e2c54c01d21058671c3c3 [diff] | |
parent | a12940d1ca89e7e79a934fc179af81807e7ccb5c [diff] |
Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc am: a12940d1ca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80