tree 27553ca25e9c28193390887467fa3c8651365849
parent 8302377af14a14ae9c8711b16f38451bfbc05e28
parent 56dcf2ab1b81ce84bd40fea6ba2d33478ca16019
author Xin Li <delphij@google.com> 1633681809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681809 +0000

[automerger skipped] Merge "Merge Android 12" am: 533afea80a -s ours am: 2299852e2e -s ours am: 768cecdae6 -s ours am: 56dcf2ab1b -s ours

am skip reason: Merged-In Ie8102d7df04bacbeb8a3a66ec6ea429e31b847cd with SHA-1 f8b362ed80 is already in history

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

Change-Id: I4ba2924b56108540bad91d14c95c82af42538e42