Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 60e78108 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-620401011b0647ba99518f69310512c1' into nyc-mr1-dev-plus-aosp 

* changes:
  Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev am: e3e95214 am: f060c06a
  Fix receive timeout on LocalSocket am: 8d5ec8d7 am: ad54b35d
parents 2ae9e260 4ebf5112
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment