tree 999baed97fbf0767b7f203791f3df08db21dc648
parent 834f53cf20b0d2da520e1ecc3be8e8c31147ef9d
parent 7e5c7b9567ffa7efce13a84ea19c5865cbf5b4c4
author Hans Boehm <hboehm@google.com> 1405601981 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405601981 +0000

am 7e5c7b95: am baab180c: Merge "Do not typedef char16_t if it is a keyword."

* commit '7e5c7b9567ffa7efce13a84ea19c5865cbf5b4c4':
  Do not typedef char16_t if it is a keyword.