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

Skip to content
Commit e678c7af authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of d2455e0c to sc-v2-dev am: 5a930d1d 

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

Change-Id: I3aea67e5133caa3c6280b271236c44f0c8468633
parents a75d2d80 5a930d1d
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