tree d9aaa96919bc81d8fbbd64c171797a81cf1a24e6
parent 3162dab6733c21e4269c5d1c97585e629f4a86f2
parent 00ce3a359459534e26c4acd8e8e17ebaec3e6672
author Treehugger Robot <treehugger-gerrit@google.com> 1600809849 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600809849 +0000

Merge changes from topic "exif-webp" am: b2356e4d98 am: 00ce3a3594

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429

Change-Id: I130b0b080472833ca8c23b2ce3302d6e184887ca