| commit | 5b671a1ebb7c80f13b38b0d16218ab03178e8283 | [log] [tgz] |
|---|---|---|
| author | Oscar Shu <xshu@google.com> | Mon Oct 25 19:29:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 25 19:29:42 2021 +0000 |
| tree | 5fba9876deeced72e85ce5cf1e6044a436b9a611 | |
| parent | 28bbee8549d76b4e05190039285675ea19755b61 [diff] | |
| parent | fa8304c92f4a9a80a99377406ada79023447ede7 [diff] |
[automerger skipped] Merge "Add new wifi nearby devices app-ops" am: b05265acbf am: 29c470eb41 am: 525c5f888b am: 19d3cbf914 am: fa8304c92f -s ours am skip reason: Merged-In Ib720a4edfe89ad599b02c0e4b5e18c98a39dc8a5 with SHA-1 aeca54e8ba is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1863260 Change-Id: Ie3fefc02de304c4b60b4bd739bb9beee38b04907