tree ce0a7ff9d5d62d89159e45d8c16b16fe094fd686
parent 53f60a1e1837377f4d5e588eec9b2d9686fbd766
parent 41e94b11c8e797e85190b02e8c5dbd5263eec409
author Remi NGUYEN VAN <reminv@google.com> 1606905274 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606905274 +0000

Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 am: 41e94b11c8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885

Change-Id: Ib842dd5097904e3ce9da1cb1ceff0325031dfd79