tree 460dbd3e8d3d2ecda6c7be2b18d9bbf00961fd4b
parent 7215f944016d58e69ce4f4dda1c70b9609b6faf9
parent decc397b267ca0769a2232ebaee6580bb082e0d1
author Chih-hung Hsieh <chh@google.com> 1508186381 +0000
committer android-build-merger <android-build-merger@google.com> 1508186381 +0000

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

Change-Id: Id4abbc6cb95b2eb96f535b6c1c5295cb27c9d2b0