| commit | 4222b87ccf9c859aa64c87bf6c4ab74c262b194c | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sun Sep 20 00:08:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 00:08:44 2015 +0000 |
| tree | a30ab17f46e6a561c754b89bfbb9b2889f6d3eab | |
| parent | cca75cc9c6a64d386511b474c56085ff2620a470 [diff] | |
| parent | db7d8e963c54246a2792e91c678bbe00fb2cc3aa [diff] |
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