tree 970fedacd90392d7773439241eb668a6166e57d6
parent a4c155438e8e63ad4b965cc2526d98b8c5db38e2
parent 87d17d0acd6bb499c88dae60eba7f8f959227861
author Paul Duffin <paulduffin@google.com> 1477309529 +0000
committer android-build-merger <android-build-merger@google.com> 1477309529 +0000

Merge "Revert "Fix code for more restrictive compiler [options]"" am: 4138eed6f4 am: ea213ab0d2
am: 87d17d0acd

Change-Id: I706602375cc670ba531db6ab5b4446be1fae5b2f