a73b5018b0937d457532392d7a508b362cea2c1c
35705d94c8
-s ours am: fa497ab8af
-s ours am: cb6059d24d
-s ours am: 1d14eb1b01
-s ours" into tm-qpr-dev-plus-aosp am: 6c462552d0
-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: I42bb8d3c3529877a305a13164dc9a347de620ca4 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%