| commit | f36de49795fe5b5c2586df7a05526af535503c85 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 11:53:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:53:11 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7d809a168ba8cef68337030cdfca2e297f0b0aa1 [diff] | |
| parent | b98be4d6fa54247c655fdbf4aed49ca1b43a6f48 [diff] |
am 1deb0317: (-s ours) am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer"" * commit '1deb03179c635c33778815e2fab950aadeeb6600':