tree 33dcfaef8994dbd2efa1533c8e7e1d1770a5e876
parent 3e49bbc4c1fdbdf79b0c33ee24407f71ac62102a
parent da4f30c5b451091068ecb5f6fa3697a7dd6bb7df
author Dan Albert <danalbert@google.com> 1418352805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418352805 +0000

am da4f30c5: Merge "Remove incompatible Unicode compatibility types."

* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
  Remove incompatible Unicode compatibility types.