tree c0a26d67cf30ca074b6d3e21fb11f6c49eb2a275
parent 4e9005527228d30cde92461ce470421d2bee248e
parent e8c304609b59ff945bc6abfed15da90804bbc27c
author Chih-Hung Hsieh <chh@google.com> 1509769684 +0000
committer android-build-merger <android-build-merger@google.com> 1509769684 +0000

Merge "Use -Werror in development/tools/line_endings" am: f1ce8d402c
am: e8c304609b

Change-Id: I90ce6c37a23a059e2510cf7cdc46654c9456e5cc