commit | 9b5257d7c408705a498fdab4d1f247d20c095371 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:45 2020 +0000 |
tree | 77bcdab79f1844ad4002e8074d47fb63ce784aff | |
parent | c934c63854b684a3e9f1bdda711e2ea55c26c996 [diff] | |
parent | 9046c1cf8bfacd041daf836ec4b18856ba46c5a0 [diff] |
[automerger skipped] Merge Android R am: e4dff5b0fe -s ours am: f42c0279d0 -s ours am: 9046c1cf8b -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: Iaee49595a5abb8d859936e7931d633942e836d7e