tree 1833919cff55c3bf330ece318566f6a5a7952db9
parent a6c44859c5344d489526641ce5a08598254da57b
parent 63082eab1f1e18b06882fbbaf08ee64c3f68193a
author Dan Albert <danalbert@google.com> 1429300383 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429300383 +0000

am 63082eab: am b6874440: Merge "Add support for a partial ubsan build."

* commit '63082eab1f1e18b06882fbbaf08ee64c3f68193a':
  Add support for a partial ubsan build.