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

Commit a9152964 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "[conflict] Merge "Remove OverviewProxyService from NavBarView." into... 

Merge "[conflict] Merge "Remove OverviewProxyService from NavBarView." into tm-d1-dev am: f6b68784" into tm-qpr-dev am: 8ad7a2fa

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



Change-Id: I62c2c78a3c042384ce43d9e51170a76ef2556df6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2aea1081 8ad7a2fa
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