| commit | 9046c1cf8bfacd041daf836ec4b18856ba46c5a0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:54 2020 +0000 |
| tree | f2810f92b50d970d2f622d286acf5ff2ac921fbe | |
| parent | b58ceb6f3c7cae486a2e16de18749f538c0f5928 [diff] | |
| parent | f42c0279d0fc76c3d8104f2525928f78c45f0523 [diff] |
[automerger skipped] Merge Android R am: e4dff5b0fe -s ours am: f42c0279d0 -s ours am skip reason: Change-Id I46d858adbe921eecebfa1c07b8c480e3be998d3d with SHA-1 22608f04a6 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1421952 Change-Id: I1b10a646d537b76589ac948d29a479f54ba49c50