2e312fd609eb496b45fffaea3c0b502dec7368af
4a547374df -s ours am: 015915736f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171 Change-Id: I7fa2d47c1267092dac9642b0febe9e1cdf58ed45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
resolve merge conflicts of
81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46
resolve merge conflicts of
81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%