| commit | c1acf682b9f8e3a9dea4d588eda400acd20acfbb | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 13 11:06:02 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 13 11:06:03 2016 +0000 |
| tree | 3783db7bc1edfaf55100eb3ab501b7c34442df94 | |
| parent | 45d65336478b26a6377963c6d4742a18d28975de [diff] | |
| parent | 23c27b9226e5647d8f20bb116b3b08b84da8ba9d [diff] |
Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 53473c1607 am: 41e6690d0c am: 29ccafe5f0 am: fd7bd2dfef am: 498ffa62c5 am: 5e4ebd02d4 am: d837e74381 am: 6025b216e4 am: a73f7e5e81 am: 79a3c84cfe am: 17cd63d00a -s ours am: b4c163b7b1 am: 127876e0c6" into nyc-mr1-dev-plus-aosp