| commit | 2e64e9590a36511eaaf655b24002d24afe927f04 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Sat Sep 12 08:49:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 08:49:15 2015 +0000 |
| tree | f39e4b7c0da5ee7ee4a0a7b5ea9e23f962536a56 | |
| parent | 419e6c3c68413bd6dbb6872340b2ae0d69a0fd60 [diff] | |
| parent | a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d [diff] |
am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev * commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d': libutils: Fix integer overflows in VectorImpl. DO NOT MERGE