tree f348d9e1a7da8b716f53e231ffe4e11ce9b314d2
parent 55c676a7eb2cffb2c017a78b731e73bfbf610b13
parent b62a6b045af4b3845a1fdb5984570576a775991f
author Chih-hung Hsieh <chh@google.com> 1507071241 +0000
committer android-build-merger <android-build-merger@google.com> 1507071241 +0000

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

Change-Id: I1e5ad3554a7db8fcc14cbde3c6fa3ab9d6f10949