| commit | f3a89e677ef6655219b9e7c9702ee5d691ff7bca | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Dec 02 10:55:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 02 10:55:57 2020 +0000 |
| tree | d97ab629ec4650d4988ed01be0552f60d0eb9b1e | |
| parent | 98ce694b1a73fcb54b12b1c005df2f1ec8fe8e90 [diff] | |
| parent | 24ea4022726a7b6ca8a0d26f9f4395c428f7f92c [diff] |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 71cd774f68 am: 41e94b11c8 am: 24ea402272 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885 Change-Id: Ib51a3218d736ab905379f20fbb059bb97b2297ef