tree 626b945bc44293652893fcde78a326d1c187e0ee
parent 4143e615a7dc993b04e3c8046a4082dac4706033
parent 64e6ce69048703bfa6dd51be346891edc166bfc6
author Primiano Tucci <primiano@google.com> 1512587180 +0000
committer android-build-merger <android-build-merger@google.com> 1512587180 +0000

Merge "Fix UBSan violation"
am: 64e6ce6904

Change-Id: I4d190fd2792ee1c1d218556c573998a7d491d869