tree fb6db12e6126873285ef61c200856f10ad330e55
parent 20e5810967d460ff3bf818aecad19b0667d8f3f7
parent c8104b0342382481704c6662af33968595ad6ab6
author Jesse Wilson <jessewilson@google.com> 1291863731 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291863731 -0800

am c8104b03: Merge "Change TextAttribute constants to be consistent with the test and RI."

* commit 'c8104b0342382481704c6662af33968595ad6ab6':
  Change TextAttribute constants to be consistent with the test and RI.