tree 79607aeb97524a5fc55ff29ab651df917ba5d147
parent 57e0185117f8d1c934e384d529321df155b03efa
parent c7c55b3ddf335d98ea7b793b6a1dce674b2a5df8
author Nick Kralevich <nnk@google.com> 1439773856 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439773856 +0000

am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"

* commit '084c00b80432a9b290c7b7c1b43c880de13553de':
  init: add LOCAL_SANITIZE := integer