tree a839aba5fee5159141abe11f77032a84e6b1a74d
parent 744efca3e0d34bf3b8c9dd4e667ebf18dfb4deda
parent 934cf9fc6a482a6187a267ed099989ffec419e5e
author Songchun Fan <schfan@google.com> 1607474878 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607474878 +0000

[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-qpr1-dev am: fd6e352d42 -s ours am: f03c563ea7 -s ours am: 934cf9fc6a -s ours

am skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 edeb081ad8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13178485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16e95f9c82c787b684524c21b02db0236c512091