commit | a12940d1ca89e7e79a934fc179af81807e7ccb5c | [log] [tgz] |
---|---|---|
author | Serik Beketayev <serikb@google.com> | Fri Dec 25 09:45:54 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 25 09:45:54 2020 +0000 |
tree | 846daa05866167f27dabcfe23e1f6a958be39482 | |
parent | fa2f9f4eee946f2dea2fc1a0e2df06aa5eac5b86 [diff] | |
parent | 872ac951ccd273aa8bfd914bc044cf1247f79626 [diff] |
Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d