| commit | 7740e236d0b0c10ad8caa932fa02e718fd32febd | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:38 2020 +0000 |
| tree | f2810f92b50d970d2f622d286acf5ff2ac921fbe | |
| parent | df1167ffc60a06b8131a71408be1ebeea12275e3 [diff] | |
| parent | a2e53b87fa4fc8564afe88712f9cb40c7a4f8963 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 5e95ddcc17 am: a2e53b87fa -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: I3ce529a19d990f0f9b0890c269acecfb7c7810b2