tree 99e74851b5887c67a882472be5726e1ffa69535a
parent 675040fd1a83ee2505e1109489adcc0d666f61ea
parent 7ca70d735dcdda3a13b38e9ccf00c9193e736f5f
author Paul Duffin <paulduffin@google.com> 1477304214 +0000
committer android-build-merger <android-build-merger@google.com> 1477304214 +0000

Merge "Fix code for more restrictive compiler [options] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=116809572" am: 127f6303bd
am: 7ca70d735d

Change-Id: I5e9bb8e5056890954c905abdd3302414a959394b