tree 30c19a16c187f5767c934eaa241c8f5a63826ec9
parent 3720181581cc402bbaf4fb5be24ccbf9cd2fc19b
parent 1df89fb55235fa35c1ef546e79bb253e65aae67a
author Chih-hung Hsieh <chh@google.com> 1510118584 +0000
committer android-build-merger <android-build-merger@google.com> 1510118584 +0000

Merge "Use -Werror in external/valgrind" am: 9187cb4ce2
am: 1df89fb552

Change-Id: I0cbcfd95225d167e36fb91b9dd719d17c8664bae