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