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

Commit a00ed7f7 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 

* commit 'a981e3b0':
  Move certain internal activity manager methods to new class.
parents 931ec986 a981e3b0
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