tree efe7c4841cd81aeafdebbb61bb5e34a55686effe
parent b9108baa01d2bbae57a804e46eea734c4fc3256f
parent 08ce69c929657887519fe3300ae13a4a1afbad8e
author Sungtak Lee <taklee@google.com> 1520633078 +0000
committer android-build-merger <android-build-merger@google.com> 1520633078 +0000

Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034c6" into pi-dev
am: 08ce69c929

Change-Id: I631141345bd39046c44f54fe12d55342790eb7cb