am 75b75d8b: am 5fdea477: Merge "Always record word boundaries"

* commit '75b75d8b28130dc091e06be791bd216060ddf226':
main
Kurt Partridge 2013-09-26 03:22:27 -07:00 committed by Android Git Automerger
commit 8b37abdacd

Diff Content Not Available