commit | 374fa7e0dc7f5c664d57d09d62a9e983b0422329 | [log] [tgz] |
---|---|---|
author | Roshan Pius <rpius@google.com> | Wed Dec 23 21:17:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 23 21:17:03 2020 +0000 |
tree | 1ae36893ad26b5885bc78b2deb75d64813bbbf47 | |
parent | a1871bab97ce24f0a6ec6b65ec451e3783313543 [diff] | |
parent | 741b00a91349ac9296f7602d3f30900403b00b68 [diff] |
[automerger skipped] Merge changes from topic "wifi_transport_info_stage_1" am: e126101fe6 am: 58c94eda42 am: 741b00a913 -s ours am skip reason: Change-Id I215b769339f68b76a1b2fa15f66c4527d184b696 with SHA-1 80222a8079 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508601 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c79d56329da2544e3f0d8520a66b227e3b1e4b5