[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: bee4d54ba2 am: 3d4cf6793f -s ours

Browse Source

am skip reason: Change-Id Idda3065878978e82fbb583afbdc3f8aea3e63be7 with SHA-1 77447729f4 is in history

Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/1541084

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a2157fceb57bc0f77c96b6b3bbb11586c3da923

...

This commit is contained in:

Bill Yi

2021-01-06 14:43:29 +00:00

committed by Automerger Merge Worker

parent 1616b71cba 3d4cf6793f

commit ef75491cd6

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