8a67244d48aabc3286112c5c9443cc6e662ccbbc
677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2212399
Change-Id: I67c6da9fa91608e893c79cf8b9bc0b030efd630c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am:
19ee730df2
Merge "Update SFPS enrollment education assets and add light/dark theme colors" into tm-qpr-dev am:
19ee730df2
Merge "Fix potential NPE crash in ConversationHeaderPreferenceController" am:
4378ee11ad am: 1f9c4c483a am: 693ce48efb am: 2d1b325cd0
…
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%