tree 5553db082ffc44d8dd3cc770c9dedff3434970c4
parent 19d07c06f4dc6a3a2522eba9fcfd6702baaae06e
parent 009ac87de36f1dae32f7321c022cfb8659fe358d
author Chih-hung Hsieh <chh@google.com> 1507072359 +0000
committer android-build-merger <android-build-merger@google.com> 1507072359 +0000

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

Change-Id: I15b2400d50c86a9700ddac7df5a9de59843404a5