tree 80a0ee88978bad62b9ccf94b60f78d585971f8ec
parent 2c0743601ef48e68cb95ad9ce9a7bb2924c91c95
parent 5cbdaa4e0941b516f528667eec39ade717e407c2
author Colin Cross <ccross@android.com> 1501005787 +0000
committer android-build-merger <android-build-merger@google.com> 1501005787 +0000

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

Change-Id: I17cbe8fa6c0ab422bb30c2dab3e4e75386c0d2dc