commit | 1b914e01d5d6341428067b9e14ebee5c777671ee | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 10 03:58:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:58:51 2020 +0000 |
tree | 97ab69b91fe73a5029426cc971bd6ec40710eb16 | |
parent | 4a62c48b2b8f0f61929c96263daa58161a5c84d5 [diff] | |
parent | 1ec4ee217eebc757bf9070845449ffaa656f9707 [diff] |
[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 3df3e56c26 -s ours am: e51a002175 -s ours am: 1ec4ee217e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1521187 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8764e2fa19fbc0b93863751cc9d237c1478abaf9