refs/heads/nougat-mr1.5-release - platform/frameworks/ex - Git at Google

commit: 7c824f17b3eea976ca58be7ea097cb807126f73b
[log]
author: Chris Craik <[email protected]>
Thu Jan 12 12:56:20 2017 -0800
committer: android-merger <[email protected]>
Thu Jan 19 16:54:06 2017 -0800
tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent: 30ee0df2a9066ef3d2ab7039a37cbc03c96a935e [diff]

resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207

framesequence/jni/FrameSequence_webp.cpp[diff]

1 file changed

tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85