tree f6dd90725c992ee5dee7bce165696cb5985b305d
parent 0ea8c27c93cfdcc5143012d2e7c22e11d528edcd
parent 9186d4157ac38b8c314ffe99ea031faff87de996
author Chih-hung Hsieh <chh@google.com> 1507577831 +0000
committer android-build-merger <android-build-merger@google.com> 1507577831 +0000

Merge "Use -Werror in external/lzma" am: 33ccf5db61 am: ac40f2d015 am: c5c07c720d
am: 9186d4157a

Change-Id: I7d83e7fa39b76f895d3f22661adeeadbf0c058a0