commit | f3890ebd99e3b474cf50933c7afe3199803735e3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:01 2020 +0000 |
tree | 77bcdab79f1844ad4002e8074d47fb63ce784aff | |
parent | 98f40b1a4256a568512666ce4f9cdb8fae57b33e [diff] | |
parent | 7740e236d0b0c10ad8caa932fa02e718fd32febd [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5e95ddcc17 am: a2e53b87fa -s ours am: 7740e236d0 -s ours am skip reason: Change-Id I84c06c89ceb70b56c73632de31265095a7fbcb3c with SHA-1 04fa435cb1 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1429919 Change-Id: I206ddcd92596517da37c16f8a3cfb9ec2d3e7d71