tree 301c789f7d1090835789ed9cf2f330ea78f49c4d
parent d504c68310bf86e24321a7260c2ecdd9962c8b3b
parent 59645279f48b3ae83ab42445148ea236c5dc72c4
author Pawin Vongmasa <pawin@google.com> 1460765196 +0000
committer android-build-merger <android-build-merger@google.com> 1460765196 +0000

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

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

Change-Id: I37ea7cd16f1e0fcf2ce14d6687de080a7c0931c1