commit | f42c0279d0fc76c3d8104f2525928f78c45f0523 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:36 2020 +0000 |
tree | b9dd8fcf978097d2a1c8b72daa56ddc59a713af2 | |
parent | 86bb13d72bd7e3a6eb321801f31a28d97249a84a [diff] | |
parent | e4dff5b0fe9937ff1cbe1bf00caa811833144e81 [diff] |
[automerger skipped] Merge Android R am: e4dff5b0fe -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: I9b48a4e266767f617968afa984751e87a31a0922