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

Skip to content
Commit b5d00aeb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to... 

Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main am: dab4a553

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



Change-Id: I68a4a8c3e295436ffde602910f74751de5b34bfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e662626f dab4a553
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