| commit | c34bdfca28228bcbd7c3054e760c17f6e42460d1 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Nov 20 23:46:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 20 23:46:58 2014 +0000 |
| tree | 988814eec1c2f74f93a9e5a5623a348b16b5c953 | |
| parent | e9411378812e715dbe1d63ce671b8490e74970a3 [diff] | |
| parent | 180b01693cde9567202a5209f9fdae86c1e3dadf [diff] |
am 180b0169: am 338f7285: Merge "Cast from char16_t to uint16_t where appropriate." * commit '180b01693cde9567202a5209f9fdae86c1e3dadf': Cast from char16_t to uint16_t where appropriate.