| commit | 439ab1f717dca8db33e434208a5c92f885c2d481 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sun Sep 20 01:00:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:00:24 2015 +0000 |
| tree | 65901e07cf577fa1c88f4406af63cdf5fd0ebfba | |
| parent | 96bee4f12bd2b8ef0c614606364a2493d7ee2915 [diff] | |
| parent | 4222b87ccf9c859aa64c87bf6c4ab74c262b194c [diff] |
am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev * commit '81b428f27a74f693b7c19b873c3a5a9af69da641': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE