| commit | f073553dcffa1466ad29396c3c7722e157dcd458 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Dec 02 10:34:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 02 10:34:34 2020 +0000 |
| tree | 06220db374e1497c6586b95a0b3138a31170a7ab | |
| parent | 4a0fe09eec55646d140db44981fc07ab2f34e7a8 [diff] | |
| parent | d38176e41a66eb2feff0188ee70162d3299dfccc [diff] |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 5dccc26e60 am: d38176e41a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885 Change-Id: Ib842dd5097904e3ce9da1cb1ceff0325031dfd79