| commit | 222a15622a63d11783bbc998c2c261adb3ad1bd1 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sun Sep 20 01:10:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:10:09 2015 +0000 |
| tree | 7575a92c0d995f1789c9acdb8c6ad2b351ec4f06 | |
| parent | 661600dd0f0bf48289f69915c6b9844436702a90 [diff] | |
| parent | dd0932e831551d0a57a8af646ac0f9f386e4f579 [diff] |
am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev * commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE