tree 64c945648b42f3bdc4670e600308d30a1be105f6
parent 1389cc47fc04ae8715e9a5b6ed48cd2131b4ad21
parent 6bc7d881814ae51ac1f98def9e65037e4608f3a8
author Chong Zhang <chz@google.com> 1502336823 +0000
committer android-build-merger <android-build-merger@google.com> 1502336823 +0000

Merge "stagefright: add HEIF support" into oc-mr1-dev am: 97ab472f39
am: 6bc7d88181

Change-Id: I570804240719142ebb14ab279befe69b5852d67e