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

Skip to content
Commit 448b67ee 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 

am: 9a19e894

* commit '9a19e894':
  Change how TelephonyManager handles subscriptions.

Change-Id: I7f2c6b4b7b4c1a2229c43003f0cfa6734fdc227a
parents e221f808 9a19e894
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