tree 4e092f4f50bf201e80b1b9e6f09241ace8534db5
parent 1b83b3df1ea6a49818d3f8cf1e4650f521277728
parent d4abcc7c7db1b8e5e1db3b5fcd25b99278f0f793
author Jay Tu <jay.tu@nxp.com> 1496946821 +0000
committer android-build-merger <android-build-merger@google.com> 1496946821 +0000

Merge "Merge "Merge "Use frame stride and slice height" into marshmallow-cts-dev am: c3f83dfab9  -s ours" into nougat-cts-dev am: 9fe7f1c1f8" into nougat-mr1-cts-dev
am: d4abcc7c7d

Change-Id: I6341f7bf47a804bcd221fb2dc238bf22e7cf5963