694569f60c643eba4642d49e4db64740980be7a3
25b489e212 am: 279e4c77f0 -s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 2365ad895a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: Icf5eabcdc24d83a3728768d47fb5b29c3da2ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am:
4d34eb2c7a am: 143d105dc9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am:
4d34eb2c7a am: 143d105dc9
Merge "Correct Factory Reset activity protect permission" into udc-qpr-dev am:
dd3e338823 am: 650a7e9298
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%