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

Commit f45e06ff authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by Android Git Automerger
Browse files

am 1d14e4b7: resolved conflicts for 649585db to stage-aosp-master 

* commit '1d14e4b7':
  GKI cleanup - Moved GKI_get_os_tick_count() to OSI
parents 5592747e 1d14e4b7
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