tree 0d962a51e70cdc5ac02559d6196216cacb1e3749
parent 80bd8e47f5ed379e13da1040cb6d5387cf73be33
parent fe3c61839fec3bf130aa49dc6f1f174802ad55a1
author Colin Cross <ccross@android.com> 1501005577 +0000
committer android-build-merger <android-build-merger@google.com> 1501005577 +0000

Merge "Enable ubsan check flag in build" am: 1907b9905e
am: fe3c61839f

Change-Id: I3a58609d21d730ce8a5bd5dfb66947c7f70a9526