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

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

Change-Id: Ia6d0db3bd5271156a6847e09bb32e831641f0139