| commit | f347624b110b29c4b6a7a4db3690a0023d7867c1 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sun Sep 20 01:45:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:45:34 2015 +0000 |
| tree | 5547531457bd2d7988e087f4e803616c012ea29f | |
| parent | f5538fef7fa33ecf18ce40b88110f9cd2fbce106 [diff] | |
| parent | 827bf1d131a5b0d034d0654f7366747dd5f7a13f [diff] |
am 84c7ca70: am 5ce847b2: 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 '84c7ca70028eec4a35828aa91a5c9a243d20ee10': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE