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

Skip to content
Commit 9a19e894 authored by Jonathan Basseri's avatar Jonathan Basseri Committed by android-build-merger
Browse files

resolve merge conflicts of 4c04097f to nyc-mr1-dev 

am: 04c35e78

* commit '04c35e78':
  Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
parents 09c511f0 04c35e78
Expand all 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