Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
am: c45744b895
am: f18225e8d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801 Change-Id: Idad3e1a1f174a49545decf6e6ae94af6128e49cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: