tree 1614a7c14e41c2d58c446aa1e373c87c04e9eb09
parent 56f498a674203c02c5f427a52be4a842fd60fcd9
parent 447198c057a48e4a38dd2737b5e5db12e8b623a1
author Bill Yi <byi@google.com> 1609944200 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609944200 +0000

[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 7878b21c6f am: 447198c057 -s ours

am skip reason: Change-Id I339cc3dfb18a6111c34a44250b19ad645aa05a9a with SHA-1 56f498a674 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libexif/+/1541104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e374a4d01e58e9f6fe89fe0fd22029b9e692ab0