tree 168eb90696504250f5e9e277ce043e8be78e977b
parent ec2fc363f2ada8861e41305f8a6ed56e3f694617
parent 514bb382694c399ac08a27afd36291897688751c
author Xin Li <delphij@google.com> 1599795206 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795206 +0000

[automerger skipped] Merge Android R am: bcfd31fff8 -s ours am: 82ebad86dc -s ours am: 514bb38269 -s ours

am skip reason: Change-Id Ie05b0b03ae70e57a8b05d5308599b43531be35d3 with SHA-1 6293614143 is in history

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

Change-Id: I6e15ff2bdf78944b45a7d7f892f947d509a6958c