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