| commit | b5d00aeb283d816669c6fc8c47537cab148defdf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 12 08:58:01 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 12 08:58:01 2024 -0800 |
| tree | 152c966b134ed763808635fa732db33de4f55c13 | |
| parent | e662626f71064fbbffa2375195237942bc491972 [diff] | |
| parent | dab4a553078f2fc8adff9e123763db551493e6ed [diff] |
Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main am: dab4a55307 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3402988 Change-Id: I68a4a8c3e295436ffde602910f74751de5b34bfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>