7d16ba0e172b25502c746c34a865fbf4cb61748e
35705d94c8
-s ours am: fa497ab8af
-s ours am: 82c384c62d
-s ours" into tm-d1-dev-plus-aosp am: a76378a81f
-s ours am: 568ac16fd7
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542 Change-Id: I50b66012381d285bb98753425758bb3fd32923e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master"
Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master"
Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am:
ed5ba9a647
am: e708b185e8
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%