commit | bb5fe5242cc13f423c37e5bfc0a2a1d54c0c67b2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 10 03:05:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:05:05 2020 +0000 |
tree | e22467795eb208af74959a45b19ac00000201dc3 | |
parent | 830cb6b3497026127814df4859710db04090c733 [diff] | |
parent | 32fa4f2dc54fb601c117c23fd43c20abe38a6646 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 32fa4f2dc5 -s ours am skip reason: Change-Id I7bc25bb7bd3bbfa255e399def0a786d3200bb737 with SHA-1 830cb6b349 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1521192 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7dd3213ada75505a8e6a3e6518bdafdead1ea393