tree 8c31250a527d15d67e52f8d8871ae6062178ee22
parent 2f9f50bb117259baf9aabae61106e2bf45e13e9b
parent 50659902d2df4d6fbc738b3c17ebc38d1060a140
author Nick Kralevich <nnk@google.com> 1440676516 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440676516 +0000

am 50659902: (-s ours) am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"

* commit '50659902d2df4d6fbc738b3c17ebc38d1060a140':