| commit | 7474167c80c6388886f62c78af90349f892aea8a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:15 2020 +0000 |
| tree | b060e1ed4786fcfe99c36217a59cfde063084750 | |
| parent | cc21e3aa4f93adb2019ed5ebc9096b91964c07a4 [diff] | |
| parent | 9b5257d7c408705a498fdab4d1f247d20c095371 [diff] |
[automerger skipped] Merge Android R am: e4dff5b0fe -s ours am: f42c0279d0 -s ours am: 9046c1cf8b -s ours am: 9b5257d7c4 -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: I6b841c43f5cc3384641e44052fa36e6dd62649ee