tree 326b954d29caccac56571c36447c609a1433af4c
parent f485958696c192b27ac16a41935d3445e8b4fcf5
parent a458ab05f511578c8091dabe80ef1983a0028ead
author Ivan Lozano <ivanlozano@google.com> 1500668716 +0000
committer android-build-merger <android-build-merger@google.com> 1500668716 +0000

Merge "Fix exclusion overriding local integer_overflow." am: b549e826dd
am: a458ab05f5

Change-Id: Ib136b4fc2cabc7dd5bfd10442028b0e01d34dc22