refs/heads/nougat-mr1-release - platform/frameworks/ex

commit: 285a26e05dc2fdad3a3240086872d219ff170133
[log]
author: Chris Craik <[email protected]>
Thu Jan 12 12:56:20 2017 -0800
committer: The Android Automerger <[email protected]>
Mon Jan 23 11:46:42 2017 -0800
tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent: 7f0e3dab5a892228d8dead7f0221cc9ae82474f7 [diff]

resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
(cherry picked from commit d2fd12358d35eb999ef8b92b1dcce07f7be15fc3)

framesequence/jni/FrameSequence_webp.cpp[diff]

1 file changed

tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85

camera2/
common/
framesequence/
photoviewer/
widget/
CleanSpec.mk