tree 5ae55f9f2c1455f0a6ac28398c81b6618d405d2a
parent e6957579a7ef58c7d04dd98265edab46ccc7682e
parent 757f4ef340f6b874a2bf18c5a45de39ef9bd11f8
author Sergio Giro <sgiro@google.com> 1468519680 +0000
committer android-build-merger <android-build-merger@google.com> 1468519680 +0000

Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
am: 757f4ef340

Change-Id: I29dfaa3968597fc3b0cdadd140b5790c1e61008d