tree 5b130e5d9a3afc20a4b2817adb43ddad673ced1d
parent 42849cb36995e9675b546c1345f39ab37b977f41
parent 3c453a4c42dac6a71f9d8899d7cafb589cc1b028
author Chong Zhang <chz@google.com> 1503295032 +0000
committer android-build-merger <android-build-merger@google.com> 1503295032 +0000

Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev am: 1ec1ab6803
am: 3c453a4c42  -s ours

Change-Id: I00c93e3bed9f2458d311c32eb84433a2be457ce7