commit | 329a11f7c6158c4c5fc0e6ea03491c099febc7b0 | [log] [tgz] |
---|---|---|
author | Martin Brabham <optedoblivion@google.com> | Thu Apr 29 21:33:10 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 21:33:10 2021 +0000 |
tree | d2af8454ac636c5c6369675818803ab36ef70b57 | |
parent | d50c8e070324beb3aad03dcf7cbaa25f781c0de5 [diff] | |
parent | 50e294ad9bea01f6a8f8231d7f43a9546a3f7d0f [diff] |
Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 am: 50e294ad9b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315 Change-Id: I00dc7f393edb9b562c97147d053302159c12fcdb