| commit | c15af1085c64bf288da84c87560fe2f40944bd65 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Thu May 13 17:02:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 17:02:34 2021 +0000 |
| tree | 513a65065ae5ef2fa8e03d92ddf99452c0da2e0c | |
| parent | c8968846bdaf1202c882a36c343e19b3a9925530 [diff] | |
| parent | f2888021b878a28283231139abba14e9a183944d [diff] |
[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: daffcf97ef am: f3249af8c7 am: f2888021b8 -s ours am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 40a95a5ab7 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102 Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21