Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe
am: 5f3059ff3e
am: 7ba258ee83" into tm-qpr-dev-plus-aosp am: c9bdc0bee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933 Change-Id: Id30bd30c4f339fecf54dea40a1bc0be17b98a80c Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: