| commit | 84c7ca70028eec4a35828aa91a5c9a243d20ee10 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sun Sep 20 01:37:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:37:17 2015 +0000 |
| tree | a8c65dac12e3d09c1b3fbb9bd623e9823bacfd63 | |
| parent | 16bed9650aa493194b4091700ac81c9c882d96b2 [diff] | |
| parent | 5ce847b26168444724d6653ada89e9658c0bd0ba [diff] |
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 '5ce847b26168444724d6653ada89e9658c0bd0ba': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE