Skip to content
Commit 50e294ad authored by Martin Brabham's avatar Martin Brabham Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" am: 2e677987 am: 8411b5d7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
parents 2d3dbcab 8411b5d7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment