tree cb85bde593ad6d6aa4f874dff4d0d49482bdd9fa
parent cd76f998688d145235de78ecd5b340d0eac9239d
parent b9863012c0e03e1dd8a2c6d1cbd511676f93ed35
author Chih-hung Hsieh <chh@google.com> 1507768950 +0000
committer android-build-merger <android-build-merger@google.com> 1507768950 +0000

Merge "Use -Werror in external/safe-iop" am: 5ddbb866a2
am: b9863012c0

Change-Id: Ic3d77eee31922d46ac1c0364ce488435f39911d9