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 am: 583dde3e87 am: 875b8fc080

am: fd48a7e788

Change-Id: Ib2fc0fda3e2060faf700d9c7f96b88f40eefa6fd
This commit is contained in:
Marco Nelissen 2017-01-18 19:04:04 +00:00 committed by android-build-merger
commit fbc7b7f031

Diff content is not available