diff options
| author | Narayan Kamath <narayan@google.com> | 2015-09-17 23:03:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-17 23:03:10 +0000 |
| commit | db7d8e963c54246a2792e91c678bbe00fb2cc3aa (patch) | |
| tree | d58ad16e83424194d60d6781fbeaa41fad85e49e /rootdir/etc | |
| parent | cf676a8686d5c71432beead66f6270f33116cb63 (diff) | |
| parent | 68a7837088c40e367ebf16959adc9d20d06ef0ea (diff) | |
| download | system_core-db7d8e963c54246a2792e91c678bbe00fb2cc3aa.zip system_core-db7d8e963c54246a2792e91c678bbe00fb2cc3aa.tar.gz system_core-db7d8e963c54246a2792e91c678bbe00fb2cc3aa.tar.bz2 | |
am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Diffstat (limited to 'rootdir/etc')
0 files changed, 0 insertions, 0 deletions