tree 2530628a73aede27e039434886b38bb8059da203
parent 4aa4a30de2d6fc5582f070f79fef9b3cde72dae4
parent d5424f66e3bafea7112d6e864cb9f5ea64cbeef3
author Marco Nelissen <marcone@google.com> 1484765517 +0000
committer android-build-merger <android-build-merger@google.com> 1484765517 +0000

Merge "DO NOT MERGE Decoder: Increase memory allocation for weights & offsets for interlaced clips" into mnc-dev
am: d5424f66e3

Change-Id: Id752d251dda25afb5bd70f1d21b1e6b1bb14b631