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