commit | ef09996ceec9d1c1296541858957635986f0d2b6 | [log] [tgz] |
---|---|---|
author | Sergio Giro <sgiro@google.com> | Thu Aug 27 11:54:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:05 2015 +0000 |
tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
parent | 68ff55543abac950710208eb10044f57d89aa74a [diff] | |
parent | e1ff99615de03420a9c60509e892c35600e8f64e [diff] |
am 4d8c1d22: (-s ours) am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8" * commit '4d8c1d22231fadc190f7af9febfd2ba2cad0acf8':