tree f1f32337b6812a38e1fda5417b3489e9b84de193
parent 9f3762d8c76b778c8f600486a464838731105b09
parent e896c41d85a15de06c74885fe040f3f57b63cd5d
author Pawin Vongmasa <pawin@google.com> 1460765340 +0000
committer android-build-merger <android-build-merger@google.com> 1460765340 +0000

Merge "SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation." into klp-dev am: 5964527
am: e896c41

* commit 'e896c41d85a15de06c74885fe040f3f57b63cd5d':
  SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.

Change-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7