tree aeb0a7fd8359682cd6f188f92fa017b9c74bdffa
parent a8a998c46e2722e125d1f0060e1cafae05b124f6
parent e0d66d349bb724b2c96d89d268723241d9cb6e82
author Chris Forbes <chrisforbes@google.com> 1624662790 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624662790 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Sync emojicompat changes to aosp-master"" am: cf75197813 am: e0d66d349b -s ours

am skip reason: Merged-In I23bb6a7bc40bb9e27159ed2312b413f183cc17b7 with SHA-1 df41aae3a1 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1745374

Original change: https://android-review.googlesource.com/c/platform/external/noto-fonts/+/1748232

Change-Id: I03afb7de4a9571d4eaaeeb3fbd37e00d5d4c0650