| commit | b216fba1becf8df783da9dcc5b2997fbe4b44ae7 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Tue Jul 13 08:47:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 13 08:47:53 2021 +0000 |
| tree | c84d88974988c20807d102aac807e07a9885a977 | |
| parent | aec6787528481660316568f074ccb27180118193 [diff] | |
| parent | 7592a34dc91b14994ee6f810e7daab685a2d8bc6 [diff] |
[automerger skipped] Support both R and S+ in NetworkFactory am: f829dd3c64 am: ca760dd94c -s ours am skip reason: Merged-In I6a08f39ad1633dd7c1582c362c97821e24ce6683 with SHA-1 0ff1a526c4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1759729 Change-Id: I199a28adf22d9fcc8d6f86b2e4f9e5562b6cab16