[automerger skipped] [DO NOT MERGE] Emergency button text should use sp, not dp am: 4e195acf4f am: 7745c95a7a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20129372 Change-Id: I3c942462a7adc5c961122036a0e2f66210894d7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: