[automerger skipped] Merge "Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0 am: 200f796356" into sc-v2-dev-plus-aosp am: 307efc26bd -s ours

Browse Source

am skip reason: Merged-In Ie807e31abb407f5b58665d4d2941bc75186d5c42 with SHA-1 458f1dd71c is already in history

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

Change-Id: Id7b2e895a469cc476f36e8e0142bd675dbab92f8

...

This commit is contained in:

Automerger Merge Worker

2021-06-29 01:26:21 +00:00

parent 68ecfd2910 307efc26bd

commit af056dc2f1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available