| commit | 4a140766ac9bbc79b39c9df7221744bf7938d82c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 14 14:13:16 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 14 14:13:16 2016 +0000 |
| tree | 5794b1a0d9240819358ad041600b48b8822d2c03 | |
| parent | 5c65ee5ad5ccc7a6f28516c24656775b33ddc701 [diff] | |
| parent | b973ed93cae7e28a54974e412edc9590701e5342 [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