tree ec33c632f8b6f6d0437342c4dfe211ae6e6f1ed3
parent c51fdd1bbf507862c10686458d2486f57a5b9585
parent d8c169fedf883491e46b354484909694fd52cfaf
author Dan Albert <danalbert@google.com> 1416524456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416524456 +0000

am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.