commit | 8f7b64b3c29225946360a4257c024809a63d586e | [log] [tgz] |
---|---|---|
author | Kai Shi <kaishi@google.com> | Thu Sep 10 00:22:45 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 10 00:22:45 2020 +0000 |
tree | f3f0b0f5a9e2d46b55a86c0fb4e327ef1ce6a1dc | |
parent | 404ce0ed3cc2e2e91a9e165de565c97d10c1c342 [diff] | |
parent | b15ab474914de5dda8a810748911be5bd96ab227 [diff] |
[automerger skipped] Merge changes from topic "mainlineVersion" into rvc-qpr-dev am: 59d3999893 am: b15ab47491 -s ours am skip reason: Change-Id I3eb878145a761452ddcfdd0b5c424e78212fc799 with SHA-1 f14b1a7a07 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12495216 Change-Id: I074e63b0b456decd959698ddfefa21a90e1ae511