tree 5b8f981e136c41c954320f209d4c6186d2c4cc68
parent 86d9712b807408479f213404af3378ae7e5df02f
parent 5ed442013a9639c0baf0f72c78182dda3d771ccd
author Ivan Lozano <ivanlozano@google.com> 1500669017 +0000
committer android-build-merger <android-build-merger@google.com> 1500669017 +0000

Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd am: a458ab05f5 am: 041ed5a784
am: 5ed442013a

Change-Id: Idf6c5449fb292b85d85b9a01ec84e336f4c0d4bc