| commit | 89826ba131ca3d9a88816b131ce4fa0d27b8c924 | [log] [tgz] |
|---|---|---|
| author | William Escande <wescande@google.com> | Tue Jan 25 16:34:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 25 16:34:24 2022 +0000 |
| tree | 678552359b60c32bb6678b1a5fcd1bd9ee614753 | |
| parent | 40f1545d928d133846a03917318d54acd1f5f604 [diff] | |
| parent | ca3d992029483b17101f43c4053fae7cf527a1af [diff] |
Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3d4 am: 35dda7049d am: ca3d992029 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959006 Change-Id: Icad96e3361f868e4aa485a9da69050ef0b91a52c