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

Skip to content
Commit 6a7cc1e1 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Fixed the conflict of the release methods of ActivityView &... 

Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eaf am: 3983dda6 am: a2212127 am: afa2d8c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402

Change-Id: I30ae73cfa7129bb5fd1863c96d4788e349420e09
parents 6dae2090 afa2d8c4
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