Merge "Fix QR code scanner layout in "Pair devices over Wi-Fi" page." into sc-qpr1-dev am: 85d20f5957
am: 1fc8de7343
am: 24a1b8150b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15854410 Change-Id: I9aec8a145e6f98feff7926a887fa03f7a9cf278a
This commit is contained in: