tree 0e3e6eb552784954d9803fff86d5eccd21b1ae5d
parent fa27ed1dd150c9fc289af53324abcba16b4db792
parent 5e3c7bd6d0d96e579b8298922887d4780bda3b40
author Stephen Hines <srhines@google.com> 1510364618 +0000
committer android-build-merger <android-build-merger@google.com> 1510364618 +0000

Merge "Remove unnecessary warning flags, now that the warnings are fixed." am: e3fd73e1c8
am: 5e3c7bd6d0

Change-Id: I396705354c8e8ab7c19e5ce7a5aac869c802411d