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

am: 2d7b4c6275  -s ours

Change-Id: I7fe8389dc6d2b2a81f8bd3bbd24c6b7d39f44851
This commit is contained in:
Marco Nelissen 2017-01-18 18:58:04 +00:00 committed by android-build-merger
commit 583dde3e87

Diff content is not available