commit | 17fa6d82197a85ebfe4a014cdbae77ff4304f0e4 | [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 | fed683f3b4edf94948bdb5816cf38acd3bae5374 | |
parent | d264253c40364564558cd2d0a2121fd03976a518 [diff] | |
parent | e0e7517693f1dd6bbf3178e47d8533caafc0faeb [diff] |
Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: e0e7517693 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d