commit | 1ec4ee217eebc757bf9070845449ffaa656f9707 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:51 2020 +0000 |
tree | dea6616ad349dd65817dd450f550806bf174e8de | |
parent | 778e670dc7541d5cbb49f62318ddd292711f7556 [diff] | |
parent | e51a0021757b5ae62c7b4024106b47fca7c8b397 [diff] |
[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 3df3e56c26 -s ours am: e51a002175 -s ours am skip reason: Change-Id I507e5505ae6b418001a1602ba77bf4acc8cbb9cb with SHA-1 889c85774e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1521187 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ed603157b4b96c6c8f7b1eb2c6ab2643b90c867