tree 940921563697b001cfeff1a7ba4451283e710da0
parent a550f85f84a86869f98b14c0005ec97a316f4380
parent 0bfb717a379c5f5b500fd6ef32647b214f970049
author Chih-hung Hsieh <chh@google.com> 1508182524 +0000
committer android-build-merger <android-build-merger@google.com> 1508182524 +0000

Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8
am: 0bfb717a37

Change-Id: I106827dd37a33cfcd956b2a1a3e48bd09576eadb