Skip to content
Commit 89826ba1 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topics "bluetooth-localsocket-from-filedescriptor",... 

Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3 am: 35dda704 am: ca3d9920

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

Change-Id: Icad96e3361f868e4aa485a9da69050ef0b91a52c
parents 40f1545d ca3d9920
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