| commit | 451adc55bbafa4b5f5f84a071c14434c3c9fbb84 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Aug 27 14:36:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:25 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 1aa89a4679786a805a0b41f026e0443e7263e95d [diff] | |
| parent | ef09996ceec9d1c1296541858957635986f0d2b6 [diff] |
am 855c0fb0: am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8" * commit '855c0fb07b1c9534f4783b4212eaeb1de296a4eb':