Skip to content
Commit 3983dda6 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

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

Change-Id: I6c40b6d4596ed5359262a63ec35dbacab8535e53
parents 07d77fce 1c2e8eaf
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