ee9a9b8ecd2e6603cede74fe3395039e7b3e4683
b88fbf932a
am: 7847d336d9
am: 253f948aad
-s ours am: e385aee1cd
-s ours am: 8109b4b3a3
-s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: If8294ced6fc3360ade5ce96844bfd17594579ffc
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%