| commit | e4472e31519e22d092baf7d1ee7aed24784e4e7d | [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 | ec2208249c38a069b5ff7cbd82ea380e498b7738 [diff] | |
| parent | 6ae56eaf3f2b4d4660e0ffca23c5b00df6945b84 [diff] |
[automerger skipped] Merge "[NS04] Introduce Network Offers and their callbacks" am: 393e7b3d6a am: 02e05de21f am: 6ae56eaf3f -s ours am skip reason: Merged-In Idec1fe8eb4ac6f562bf098e3dd470f11024d04f2 with SHA-1 d1b498b16d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556102 Change-Id: Idf45cf2f62c4ba2182f00ae2f05c150e0fdb6d21