| commit | 41e94b11c8e797e85190b02e8c5dbd5263eec409 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Dec 02 10:05:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 02 10:05:42 2020 +0000 |
| tree | 5ccab9ea2b0cd9bf01ca062173a80847e567a4cc | |
| parent | cc691aa7ac035a11f17deeb72d9154fe6a1139ed [diff] | |
| parent | 71cd774f6849ed5ef2adaa15837c9f585ed25735 [diff] |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885 Change-Id: I0eb069c5ed0daca29f1bc4d3fd62f83879985b1c