tree 18ca49d1395fc6d789f950e2c5a3f1df7225cec2
parent 8a7da69b967f12d31f5589a54a43144b3139972a
parent af60d7f8b5535ddb3a365ba956dd9638003c2218
author Chih-hung Hsieh <chh@google.com> 1511214702 +0000
committer android-build-merger <android-build-merger@google.com> 1511214702 +0000

Merge "Use -Werror in frameworks/base" am: a29836ad04 am: 267a2a8c8a
am: af60d7f8b5

Change-Id: I9daf24758eab254650dc0ea8809c56d0d536a641