tree c2f923b59427284d3224832e7a555334d7a7b066
parent 4c3959cabd50a667f4ea5ec8fb0fe1369ec0d96b
parent baab180c2d37157cef66d1c8fb9b0726477a2e18
author Hans Boehm <hboehm@google.com> 1405600218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405600218 +0000

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

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