tree cde132b8cfbead4d368df42ac8520fdba1cb97cf
parent dd6bc7a6cb53b3272e0725d384e0c3fac1286b4a
parent 9716299126d3efebfebe985f16cda88f0b977efc
author Chih-Hung Hsieh <chh@google.com> 1507683655 +0000
committer android-build-merger <android-build-merger@google.com> 1507683655 +0000

Merge "Use -Werror in libnativehelper/tests" am: e70c5c000f am: 6f67e5d833 am: 23f9c689fd
am: 9716299126

Change-Id: I5332c92ada750b0a6b6c8ec6ff947627904d3337