[automerger skipped] Merge "[CDM] Checks NLS component name instead of package name" into tm-dev am: 14629c9d47
am: 7d438b77b4
am: 900dbd8df9
am: d46a401c18
-s ours
am skip reason: Merged-In I1be52fcb3d52b8b84353ea00fd57d8360ddd966c with SHA-1 f5ed187ffb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/31744520
Change-Id: Ie60c4dcb48dfd770672382103b93ea79d3f3cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: