tree 7de8aa177e218a24510cc6ee8873e802f8d428aa
parent aeac9cd1b3c9a1dfe334857e74b20ff1843ae87c
parent aaa920d7969d9dd4b9e7871f2758d9092095bead
author Dan Albert <danalbert@google.com> 1415523810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415523810 +0000

am aaa920d7: Merge "Make Unicode.h use types that match libc++."

* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.