diff options
author | Narayan Kamath <narayan@google.com> | 2015-09-12 09:46:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-12 09:46:18 +0000 |
commit | 68a7837088c40e367ebf16959adc9d20d06ef0ea (patch) | |
tree | 71a2d43f989e365c43bfaf91683b1587589a29de /debuggerd/utility.h | |
parent | 52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37 (diff) | |
parent | 2e64e9590a36511eaaf655b24002d24afe927f04 (diff) | |
download | system_core-68a7837088c40e367ebf16959adc9d20d06ef0ea.zip system_core-68a7837088c40e367ebf16959adc9d20d06ef0ea.tar.gz system_core-68a7837088c40e367ebf16959adc9d20d06ef0ea.tar.bz2 |
am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit '2e64e9590a36511eaaf655b24002d24afe927f04':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Diffstat (limited to 'debuggerd/utility.h')
0 files changed, 0 insertions, 0 deletions