| commit | 70fe039bc445236563e6cd2e4cbb31d0733c3236 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:45 2020 +0000 |
| tree | f7e942aae34fdc13895dbccda17122b1fc78f39c | |
| parent | f1ea6ac598a0568fe2068796833bbc5b197b1071 [diff] | |
| parent | 7474167c80c6388886f62c78af90349f892aea8a [diff] |
[automerger skipped] Merge Android R am: e4dff5b0fe -s ours am: f42c0279d0 -s ours am: 9046c1cf8b -s ours am: 9b5257d7c4 -s ours am: 7474167c80 -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: I166c89250c6bbf595f6813c22927a9a2b180fb3a