tree d1d3d14ec18166381a57c0975a600375a36146da
parent 2b4edce1480b01ded7239a9a0b8f89887e4f4952
parent 4c6269ce280f33c7d080dbdbbfd3a8d9681d85ed
author Nick Kralevich <nnk@google.com> 1434499785 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434499785 +0000

am 4c6269ce: am 106f92f5: Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS""

* commit '4c6269ce280f33c7d080dbdbbfd3a8d9681d85ed':
  Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"