| commit | 39bff63a9e9645de96e71892ccb1d6995ad77c59 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 14:31:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 14:31:06 2016 +0000 |
| tree | 7d6cfa36d80d42408f85e2568f073cbc16164c60 | |
| parent | 8c04baeb90251df1f9cc7e60e601b87e4bf42077 [diff] | |
| parent | 4a140766ac9bbc79b39c9df7221744bf7938d82c [diff] |
Merge \"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6 am: d0ad14ca21 am: 3841c92912 -s ours am: 247ac63c69 -s ours am: 6179f1a56e am: 451f4b3d04 am: 3c85e4e5e7 -s ours am: baac6666fe am: 2858362ffe am: 7a0c6bf505 am: f96271187f -s ours am: 53d529a585 am: deb0b40f1f\" into nyc-mr1-dev-plus-aosp am: 6b5de6a10c -s ours Change-Id: Ie864fa1536e957aabaceaf2a62d014dff16fdfe5