tree 874b00d8da3bbd06827691f0ed227c58282e6d81
parent 661f351c408038c2272f1502a53636bb4b6b8851
parent 9ce9433d7c66a41eb5ea0ed2ebd442538f574ca6
author Chih-hung Hsieh <chh@google.com> 1507070801 +0000
committer android-build-merger <android-build-merger@google.com> 1507070801 +0000

Merge "Do not use -Werror yet." am: ed8aa2854c
am: 9ce9433d7c

Change-Id: Id4cb740640e53a3fd95c2b01b6ac9418348248fe