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

Skip to content
Commit 152d353e authored by Rom Lemarchand's avatar Rom Lemarchand Committed by android-build-merger
Browse files

Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev 

am: 5032e49f

* commit '5032e49f':
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.
parents e1cbe99e 5032e49f
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