tree f2585b2a117addca72b10995d3e3d5835b6fea52
parent 3b283a3ae40375565ceb3b8895c5e22da5fb3334
parent 70627fe4d97ff334a04689356e4b9878eab8cfcd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582603474 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582603474 +0000

[automerger skipped] Merge "Indicate PiP animation type from Launcher to SysUI am: a1a91b0c50 am: fcc8994dd2" into rvc-d1-dev-plus-aosp am: b3e08f79cc -s ours am: 70627fe4d9 -s ours
am skip reason: Change-Id I617a17fd5f6049d9f1d49f9f834623a2bb49f6ca with SHA-1 a1a91b0c50 is in history

Change-Id: I3b14bf2900d044bfa1acd9b160272544b7e8e901