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

Commit d172cae5 authored by Diego Perez's avatar Diego Perez Committed by android-build-merger
Browse files

resolve merge conflicts of aa9c9fb2 to nyc-dev 

am: 16e17a77

* commit '16e17a77':
  Replace SimpleDateFormat implementation
parents 060838dc 16e17a77
Show 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