9c4b3af7cc1343f30d807039fc44be1d28b426a6
f58714496a
-s ours am: 0dcfdacc25
-s ours am: d320388f91
-s ours am: 6066b06cc1
-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: I6691cfcaecb22ba91aadd7fa3af346826333e8ac
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%