tree 7cab0974101f2dc35a727b463de59f0dfc8529a4
parent 3dad1cabd086cd3b19be48a39cfcd26198991da3
parent 0ca0039118acb8ebbd313451068a40c2e82283c9
author Treehugger Robot <treehugger-gerrit@google.com> 1677612804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677612804 +0000

Merge "Renamed name source to display name source" am: 0ca0039118

Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2459268

Change-Id: I5b835f981c6873fb08b00e7d15d67f18b8899f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>