| commit | 8ad336f4b170d6bff1e3f958712f1137be645773 | [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 | 0a9da2b0464f55e417cedeb4ce04aedbd97c2e7d | |
| parent | f130c6ddf08b54cc824c6b71e8a268fc3ec98cce [diff] | |
| parent | b90fb723bd431accdb8a51df4e7e6a7732f81007 [diff] |
[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: d603e40fa5 am: 06e72bc268 am: b90fb723bd -s ours am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 1ef1d90ee0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102 Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21