| commit | 24bf0383e46857235c5548965650a3d7b9897fb1 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Wed Jul 13 13:34:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 13:34:28 2016 +0000 |
| tree | 84f549d9e76eb162ceaa3cf7e40771c95c8f1338 | |
| parent | 57a107a5b484df2ba58a7815d097a071d27f775e [diff] | |
| parent | 43aa34c36d1658c64ca147333a4ab3d16cb70583 [diff] |
Merge \"Revert \\\\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5 -s ours am: 01799f4381 am: 83df11fe0d\" into nyc-mr1-dev-plus-aosp am: d3699b3fe7 Change-Id: Icccae5dfa1c4776e0e434114c113a983d32aa785