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

Skip to content
Commit 7c90c68f authored by Treehugger Robot's avatar Treehugger Robot Committed by Nick Chalko
Browse files

[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2146883



Change-Id: Iac6e734f763dcd5deeeaa4021c074d1950eefb8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dc64e4d ca39b91f
Hide 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