diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-20 00:08:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-20 00:08:44 +0000 |
| commit | 81b428f27a74f693b7c19b873c3a5a9af69da641 (patch) | |
| tree | a30ab17f46e6a561c754b89bfbb9b2889f6d3eab /include/cutils/trace.h | |
| parent | 832a0d1c64bc3d451f95c8779a361414c544b5ce (diff) | |
| parent | db7d8e963c54246a2792e91c678bbe00fb2cc3aa (diff) | |
| download | system_core-81b428f27a74f693b7c19b873c3a5a9af69da641.zip system_core-81b428f27a74f693b7c19b873c3a5a9af69da641.tar.gz system_core-81b428f27a74f693b7c19b873c3a5a9af69da641.tar.bz2 | |
am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Diffstat (limited to 'include/cutils/trace.h')
0 files changed, 0 insertions, 0 deletions