tree 4eaaf7b8e11b70b526dd0d4d038be6365563e23e
parent 507669d9a3c8adb2b415488783efe10bf9a6b3a3
parent a1ded1f5ffb002c4514344a178fcc2a2eff44992
author Chih-hung Hsieh <chh@google.com> 1507764629 +0000
committer android-build-merger <android-build-merger@google.com> 1507764629 +0000

Merge "Use -Werror in external/opencv" am: 28459d52af am: ba9cf7de2d
am: a1ded1f5ff

Change-Id: I46fb257a88d786a85e8e2f2fc82109fbc21feca6