commit | 43aa34c36d1658c64ca147333a4ab3d16cb70583 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 13 13:31:19 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 13 13:31:19 2016 +0000 |
tree | 3783db7bc1edfaf55100eb3ab501b7c34442df94 | |
parent | 9136ff0fe4327e71089f41070cea9c2d8111ef66 [diff] | |
parent | b470c896ae6743623046d4d53662bc4d9f7ade03 [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