tree 32993c0a6dbdf9243b308bbf43bcc650fa0b8b01
parent c4284c2b019bfada7db8c0eb3d55c87208dca472
parent 3985765a17d932b2cc54ebd942804d5b73a6cdc1
author Chong Zhang <chz@google.com> 1504150584 +0000
committer android-build-merger <android-build-merger@google.com> 1504150584 +0000

Merge "Add heif format to ExifInterface" into oc-mr1-dev am: e034a1f5ed
am: 3985765a17

Change-Id: I1cb5527a9bb1a63cb960cbc7d38aa955353a28c9