tree 650f6ef0f91695ade9898494cfd8bc8fcc080865
parent ea469443e9c2cd1fda87188df2b1ffe0e30656b2
parent d015e63b13f41fdd1c83ee1e3413085d5686e92b
author Chih-Hung Hsieh <chh@google.com> 1510087858 +0000
committer android-build-merger <android-build-merger@google.com> 1510087858 +0000

Merge "Use -Werror in external/stressapptest" am: 7492904062 am: 00ddbf2caa
am: d015e63b13

Change-Id: Ia8c4c734a98fca79accfb059f1d7e3885ef79e8d