dc3404939cd5a9cc9997c4fa6716bb754af94c31
25b489e212
am: add8f5cda2
-s ours
am skip reason: Merged-In Id7edde492168b467360c6c99b326721cd883bba8 with SHA-1 f58714496a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I2cd78c810b1cbe4f3f8f43370e6d64b460446cd9
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%